tidy compatibility

This commit is contained in:
TenPlus1 2018-08-15 16:12:54 +01:00
parent b6d39b6ca3
commit 47ef7f8aa4
1 changed files with 75 additions and 67 deletions

View File

@ -1,10 +1,19 @@
-- add food group to default apple and brown mushroom -- check for Ethereal mod and add quick alias function
local eth = minetest.get_modpath("ethereal")
local alias = function(orig, new)
minetest.register_alias(orig, new)
end
--= Overrides
-- add food_* group to apple
minetest.override_item("default:apple", { minetest.override_item("default:apple", {
groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2, groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2,
leafdecay = 3, leafdecay_drop = 1}, leafdecay = 3, leafdecay_drop = 1},
}) })
-- add food_* group to brown mushroom
if minetest.registered_nodes["flowers:mushroom_brown"] then if minetest.registered_nodes["flowers:mushroom_brown"] then
minetest.override_item("flowers:mushroom_brown", { minetest.override_item("flowers:mushroom_brown", {
light_source = 1, light_source = 1,
@ -12,14 +21,13 @@ minetest.override_item("flowers:mushroom_brown", {
}) })
end end
-- is Ethereal mod installed? --= Aliases
local eth = minetest.get_modpath("ethereal")
-- Banana -- Banana
if eth then if eth then
minetest.register_alias("farming_plus:banana_sapling", "ethereal:banana_tree_sapling") alias("farming_plus:banana_sapling", "ethereal:banana_tree_sapling")
minetest.register_alias("farming_plus:banana_leaves", "ethereal:bananaleaves") alias("farming_plus:banana_leaves", "ethereal:bananaleaves")
minetest.register_alias("farming_plus:banana", "ethereal:banana") alias("farming_plus:banana", "ethereal:banana")
else else
minetest.register_node(":ethereal:banana", { minetest.register_node(":ethereal:banana", {
description = "Banana", description = "Banana",
@ -39,34 +47,34 @@ else
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
minetest.register_alias("farming_plus:banana_sapling", "default:sapling") alias("farming_plus:banana_sapling", "default:sapling")
minetest.register_alias("farming_plus:banana_leaves", "default:leaves") alias("farming_plus:banana_leaves", "default:leaves")
minetest.register_alias("farming_plus:banana", "ethereal:banana") alias("farming_plus:banana", "ethereal:banana")
end end
-- Carrot -- Carrot
minetest.register_alias("farming_plus:carrot_seed", "farming:carrot") alias("farming_plus:carrot_seed", "farming:carrot")
minetest.register_alias("farming_plus:carrot_1", "farming:carrot_1") alias("farming_plus:carrot_1", "farming:carrot_1")
minetest.register_alias("farming_plus:carrot_2", "farming:carrot_4") alias("farming_plus:carrot_2", "farming:carrot_4")
minetest.register_alias("farming_plus:carrot_3", "farming:carrot_6") alias("farming_plus:carrot_3", "farming:carrot_6")
minetest.register_alias("farming_plus:carrot", "farming:carrot_8") alias("farming_plus:carrot", "farming:carrot_8")
minetest.register_alias("farming_plus:carrot_item", "farming:carrot") alias("farming_plus:carrot_item", "farming:carrot")
-- Cocoa -- Cocoa
minetest.register_alias("farming_plus:cocoa_sapling", "farming:cocoa_beans") alias("farming_plus:cocoa_sapling", "farming:cocoa_beans")
minetest.register_alias("farming_plus:cocoa_leaves", "default:leaves") alias("farming_plus:cocoa_leaves", "default:leaves")
minetest.register_alias("farming_plus:cocoa", "default:apple") alias("farming_plus:cocoa", "default:apple")
minetest.register_alias("farming_plus:cocoa_bean", "farming:cocoa_beans") alias("farming_plus:cocoa_bean", "farming:cocoa_beans")
-- Orange -- Orange
minetest.register_alias("farming_plus:orange_1", "farming:tomato_1") alias("farming_plus:orange_1", "farming:tomato_1")
minetest.register_alias("farming_plus:orange_2", "farming:tomato_4") alias("farming_plus:orange_2", "farming:tomato_4")
minetest.register_alias("farming_plus:orange_3", "farming:tomato_6") alias("farming_plus:orange_3", "farming:tomato_6")
if eth then if eth then
minetest.register_alias("farming_plus:orange_item", "ethereal:orange") alias("farming_plus:orange_item", "ethereal:orange")
minetest.register_alias("farming_plus:orange", "ethereal:orange") alias("farming_plus:orange", "ethereal:orange")
minetest.register_alias("farming_plus:orange_seed", "ethereal:orange_tree_sapling") alias("farming_plus:orange_seed", "ethereal:orange_tree_sapling")
else else
minetest.register_node(":ethereal:orange", { minetest.register_node(":ethereal:orange", {
description = "Orange", description = "Orange",
@ -86,45 +94,45 @@ else
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
minetest.register_alias("farming_plus:orange_item", "ethereal:orange") alias("farming_plus:orange_item", "ethereal:orange")
minetest.register_alias("farming_plus:orange", "ethereal:orange") alias("farming_plus:orange", "ethereal:orange")
minetest.register_alias("farming_plus:orange_seed", "default:sapling") alias("farming_plus:orange_seed", "default:sapling")
end end
-- Potato -- Potato
minetest.register_alias("farming_plus:potato_item", "farming:potato") alias("farming_plus:potato_item", "farming:potato")
minetest.register_alias("farming_plus:potato_1", "farming:potato_1") alias("farming_plus:potato_1", "farming:potato_1")
minetest.register_alias("farming_plus:potato_2", "farming:potato_2") alias("farming_plus:potato_2", "farming:potato_2")
minetest.register_alias("farming_plus:potato", "farming:potato_3") alias("farming_plus:potato", "farming:potato_3")
minetest.register_alias("farming_plus:potato_seed", "farming:potato") alias("farming_plus:potato_seed", "farming:potato")
-- Pumpkin -- Pumpkin
minetest.register_alias("farming:pumpkin_seed", "farming:pumpkin_slice") alias("farming:pumpkin_seed", "farming:pumpkin_slice")
minetest.register_alias("farming:pumpkin_face", "farming:jackolantern") alias("farming:pumpkin_face", "farming:jackolantern")
minetest.register_alias("farming:pumpkin_face_light", "farming:jackolantern_on") alias("farming:pumpkin_face_light", "farming:jackolantern_on")
minetest.register_alias("farming:big_pumpkin", "farming:jackolantern") alias("farming:big_pumpkin", "farming:jackolantern")
minetest.register_alias("farming:big_pumpkin_side", "air") alias("farming:big_pumpkin_side", "air")
minetest.register_alias("farming:big_pumpkin_top", "air") alias("farming:big_pumpkin_top", "air")
minetest.register_alias("farming:big_pumpkin_corner", "air") alias("farming:big_pumpkin_corner", "air")
minetest.register_alias("farming:scarecrow", "farming:jackolantern") alias("farming:scarecrow", "farming:jackolantern")
minetest.register_alias("farming:scarecrow_light", "farming:jackolantern_on") alias("farming:scarecrow_light", "farming:jackolantern_on")
minetest.register_alias("farming:pumpkin_flour", "farming:pumpkin_dough") alias("farming:pumpkin_flour", "farming:pumpkin_dough")
-- Rhubarb -- Rhubarb
minetest.register_alias("farming_plus:rhubarb_seed", "farming:rhubarb") alias("farming_plus:rhubarb_seed", "farming:rhubarb")
minetest.register_alias("farming_plus:rhubarb_1", "farming:rhubarb_1") alias("farming_plus:rhubarb_1", "farming:rhubarb_1")
minetest.register_alias("farming_plus:rhubarb_2", "farming:rhubarb_2") alias("farming_plus:rhubarb_2", "farming:rhubarb_2")
minetest.register_alias("farming_plus:rhubarb", "farming:rhubarb_3") alias("farming_plus:rhubarb", "farming:rhubarb_3")
minetest.register_alias("farming_plus:rhubarb_item", "farming:rhubarb") alias("farming_plus:rhubarb_item", "farming:rhubarb")
-- Strawberry -- Strawberry
if eth then if eth then
minetest.register_alias("farming_plus:strawberry_item", "ethereal:strawberry") alias("farming_plus:strawberry_item", "ethereal:strawberry")
minetest.register_alias("farming_plus:strawberry_seed", "ethereal:strawberry") alias("farming_plus:strawberry_seed", "ethereal:strawberry")
minetest.register_alias("farming_plus:strawberry_1", "ethereal:strawberry_1") alias("farming_plus:strawberry_1", "ethereal:strawberry_1")
minetest.register_alias("farming_plus:strawberry_2", "ethereal:strawberry_3") alias("farming_plus:strawberry_2", "ethereal:strawberry_3")
minetest.register_alias("farming_plus:strawberry_3", "ethereal:strawberry_5") alias("farming_plus:strawberry_3", "ethereal:strawberry_5")
minetest.register_alias("farming_plus:strawberry", "ethereal:strawberry_7") alias("farming_plus:strawberry", "ethereal:strawberry_7")
else else
minetest.register_craftitem(":ethereal:strawberry", { minetest.register_craftitem(":ethereal:strawberry", {
description = "Strawberry", description = "Strawberry",
@ -134,22 +142,22 @@ else
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
}) })
minetest.register_alias("farming_plus:strawberry_item", "ethereal:strawberry") alias("farming_plus:strawberry_item", "ethereal:strawberry")
minetest.register_alias("farming_plus:strawberry_seed", "ethereal:strawberry") alias("farming_plus:strawberry_seed", "ethereal:strawberry")
minetest.register_alias("farming_plus:strawberry_1", "farming:raspberry_1") alias("farming_plus:strawberry_1", "farming:raspberry_1")
minetest.register_alias("farming_plus:strawberry_2", "farming:raspberry_2") alias("farming_plus:strawberry_2", "farming:raspberry_2")
minetest.register_alias("farming_plus:strawberry_3", "farming:raspberry_3") alias("farming_plus:strawberry_3", "farming:raspberry_3")
minetest.register_alias("farming_plus:strawberry", "farming:raspberry_4") alias("farming_plus:strawberry", "farming:raspberry_4")
end end
-- Tomato -- Tomato
minetest.register_alias("farming_plus:tomato_seed", "farming:tomato") alias("farming_plus:tomato_seed", "farming:tomato")
minetest.register_alias("farming_plus:tomato_item", "farming:tomato") alias("farming_plus:tomato_item", "farming:tomato")
minetest.register_alias("farming_plus:tomato_1", "farming:tomato_2") alias("farming_plus:tomato_1", "farming:tomato_2")
minetest.register_alias("farming_plus:tomato_2", "farming:tomato_4") alias("farming_plus:tomato_2", "farming:tomato_4")
minetest.register_alias("farming_plus:tomato_3", "farming:tomato_6") alias("farming_plus:tomato_3", "farming:tomato_6")
minetest.register_alias("farming_plus:tomato", "farming:tomato_8") alias("farming_plus:tomato", "farming:tomato_8")
-- Weed -- Weed
minetest.register_alias("farming:weed", "default:grass_2") alias("farming:weed", "default:grass_2")