From af6d08414b2c63c0bea4fb0c64e4931504ac67ac Mon Sep 17 00:00:00 2001 From: Hybrid Dog Date: Sat, 30 Dec 2017 16:21:26 +0100 Subject: Remove obsolete jungletree legacy aliases Bas080's jungletree mod from 2013 registered those nodes, so the aliases are very old. The sumpf modpack uses an updated version of that jungletree mod, so when using sumpf and moretrees together a warning appeared. --- node_defs.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/node_defs.lua b/node_defs.lua index 505ff75..b33dede 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -1,7 +1,7 @@ local S = moretrees.intllib moretrees.avoidnodes = {} - + moretrees.treelist = { {"beech", "Beech Tree"}, {"apple_tree", "Apple Tree"}, @@ -27,7 +27,7 @@ local dirs3 = { 14, 11, 16, 5, 14 } local moretrees_new_leaves_drawtype = "allfaces_optional" local moretrees_plantlike_leaves_visual_scale = 1 -if moretrees.plantlike_leaves then +if moretrees.plantlike_leaves then moretrees_new_leaves_drawtype = "plantlike" moretrees_plantlike_leaves_visual_scale = math.sqrt(2) end @@ -159,7 +159,7 @@ for i in ipairs(moretrees.treelist) do stairsplus:register_all( "moretrees", treename.."_trunk", - "moretrees:"..treename.."_trunk", + "moretrees:"..treename.."_trunk", { groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 }, tiles = { @@ -480,10 +480,6 @@ minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horiz minetest.register_alias("moretrees:jungletree_planks", "default:junglewood") minetest.register_alias("moretrees:jungletree_leaves_green", "default:jungleleaves") -minetest.register_alias("jungletree:leaves_green", "default:jungleleaves") -minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red") -minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow") - minetest.register_alias("moretrees:acacia_trunk", "default:acacia_tree") minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood") minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling") -- cgit v1.2.3 From ba2cd3d9b8f1100d9e05651bd3d836a322ba58b5 Mon Sep 17 00:00:00 2001 From: Hybrid Dog Date: Sun, 18 Jun 2017 12:25:20 +0200 Subject: Use new setting functions --- init.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index c9813db..49f950e 100644 --- a/init.lua +++ b/init.lua @@ -2,13 +2,13 @@ -- -- This mod adds more types of trees to the game -- --- Some of the node definitions and textures came from cisoun's conifers mod +-- Some of the node definitions and textures came from cisoun's conifers mod -- and bas080's jungle trees mod. -- -- Brought together into one mod and made L-systems compatible by Vanessa -- Ezekowitz. -- --- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the +-- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the -- latter having been tweaked by RealBadAngel, most other axioms/rules written -- by RealBadAngel. -- @@ -51,7 +51,8 @@ end -- infinite stacks checking -if minetest.get_modpath("unified_inventory") or not minetest.setting_getbool("creative_mode") then +if minetest.get_modpath"unified_inventory" +or not minetest.settings:get_bool"creative_mode" then moretrees.expect_infinite_stacks = false else moretrees.expect_infinite_stacks = true @@ -224,7 +225,7 @@ function moretrees.grow_jungletree(pos) local r2 = math.random(3) if r1 == 1 then moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red" - else + else moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_yellow" end moretrees.jungletree_model.leaves2_chance = math.random(25, 75) -- cgit v1.2.3 From e5524c007d2080a8c5d798c6a85ca2fbae4b4ab5 Mon Sep 17 00:00:00 2001 From: Hybrid Dog Date: Tue, 9 Jan 2018 20:01:47 +0100 Subject: follow minetest lua code style guidelines --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 49f950e..f3f840f 100644 --- a/init.lua +++ b/init.lua @@ -51,8 +51,8 @@ end -- infinite stacks checking -if minetest.get_modpath"unified_inventory" -or not minetest.settings:get_bool"creative_mode" then +if minetest.get_modpath("unified_inventory") or not + minetest.settings:get_bool("creative_mode") then moretrees.expect_infinite_stacks = false else moretrees.expect_infinite_stacks = true -- cgit v1.2.3