From ff8dc2c42c88e36d4fca71f370fe46c14aa9aae9 Mon Sep 17 00:00:00 2001 From: ademant Date: Wed, 9 Jan 2019 08:28:23 +0100 Subject: [PATCH] code optim --- abm.lua | 2 +- compatibility.lua | 4 ++++ nodes_register.lua | 19 ++++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/abm.lua b/abm.lua index 4b8856c..25d552d 100644 --- a/abm.lua +++ b/abm.lua @@ -90,7 +90,7 @@ minetest.register_abm({ minetest.register_abm({ label="Planting crops", nodenames = farming.change_soil, - neighbors = {"air"}, + neighbors = {"air","group:grass","group:dry_grass"}, interval = farming.abm_planting+math.random(-1,1), -- little noise chance = farming.abm_planting_chance, action = function(pos) diff --git a/compatibility.lua b/compatibility.lua index 808000d..eadc3aa 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -20,6 +20,10 @@ minetest.override_item("flowers:mushroom_brown", { }) end +jg_groups=table.copy(minetest.registered_nodes["default:junglegrass"].groups) +jg_groups["grass"]=1 +minetest.override_item("default:junglegrass",{groups=jg_groups}) + --= Aliases -- Banana diff --git a/nodes_register.lua b/nodes_register.lua index e680330..25f4d4c 100644 --- a/nodes_register.lua +++ b/nodes_register.lua @@ -77,8 +77,9 @@ farming.register_plant = function(def) def.step_name=def.mod_name..":"..def.name def.seed_name=def.mod_name..":"..def.name.."_seed" def.plant_name = def.name + local def_groups=def.groups -- if plant has harvest then registering - if def.groups["has_harvest"] ~= nil then + if def_groups["has_harvest"] ~= nil then -- if plant drops seed of wild crop, set the wild seed as harvest if def.seed_drop ~= nil then def.harvest_name = def.seed_drop @@ -90,7 +91,7 @@ farming.register_plant = function(def) def.harvest_name=def.seed_name end - if def.groups["wiltable"] == 2 then + if def_groups["wiltable"] == 2 then def.wilt_name=def.mod_name..":wilt_"..def.name farming.register_wilt(def) end @@ -100,7 +101,7 @@ farming.register_plant = function(def) farming.register_steps(def) -- crops, which should be cultured, does not randomly appear on the field - if (not def.groups["to_culture"]) then + if (not def_groups["to_culture"]) then local edef=def local spread_def={name=def.step_name.."_1", temp_min=edef.temperature_min,temp_max=edef.temperature_max, @@ -111,7 +112,7 @@ farming.register_plant = function(def) table.insert(farming.spreading_crops,1,spread_def) end - if def.groups["infectable"] then + if def_groups["infectable"] then farming.register_infect(def) end @@ -125,27 +126,27 @@ farming.register_plant = function(def) end end - if def.groups["use_flail"] then + if def_groups["use_flail"] then if def.straw == nil then def.straw= "farming:straw" end farming.craft_seed(def) end - if def.groups["use_trellis"] then + if def_groups["use_trellis"] then farming.trellis_seed(def) -- print(dump(def)) end - if def.groups["seed_grindable"] then + if def_groups["seed_grindable"] then farming.register_grind(def) end - if def.groups["seed_roastable"] then + if def_groups["seed_roastable"] then farming.register_roast(def) end - if def.groups["for_coffee"] then + if def_groups["for_coffee"] then farming.register_coffee(def) end