Merge branch 'master' of https://github.com/vlapsley/outback

mods/ITEMS/flowers/init.lua

@@ -249,5 +249,3 @@ minetest.register_node("flowers:waterlily", {
 	end
 })
 
--- Aliases for schematic nodes
-minetest.register_alias("default:dirt", "default:dirt")

mods/ITEMS/trunks/generating.lua

@@ -337,7 +337,7 @@ if Bottlebrush_Orchid == true then
 abstract_trunks.grow_bottlebrush_orchid = function(pos)
 	local on_ground = {x=pos.x, y=pos.y+1, z=pos.z}
 	
-	minetest.set_node(on_ground, {name="base:bottlebrush_orchid", param2=math.random(0,3)})
+	minetest.set_node(on_ground, {name="flowers:bottlebrush_orchid", param2=math.random(0,3)})
 	
 end
 

mods/ITEMS/vines/.luacheckrc

@@ -1,13 +0,0 @@
-
-unused_args = false
-
-read_globals = {
-	"minetest",
-	"default",
-	"ItemStack",
-	"biome_lib",
-}
-
-globals = {
-	"vines",
-}

mods/ITEMS/vines/LICENSE.md

@@ -1,4 +0,0 @@
-License
-=======
-- Code	WTFPL
-- Texture	CC

mods/ITEMS/vines/README.md

@@ -1,56 +0,0 @@
-# Vines
-
-## Features
-- Rope block for spawning rope that slowly drops into the deep.
-- Vines are climbable and slowly grow downward.
-- Shears that allow the collecting of vines.
-- Spawns vines on jungletree leaves.
-- Roots on the bottom of dirt and dirt with grass nodes.
-- Spawns vines on trees located in swampy area.
-- Jungle vines that spawn on the side of jungletrees
-
-## API
-The API is very minimal. It allows the registering of vines and the spawning of
-existing vines on nodes of your own.
-
-If you want vines to spawn on a certain node then you can choose which vine by
-adding to the node groups the unique group of that vine. This is determined by
-the name of the vine ( see vines.lua ) appended with '_vines'.
-An example would be.
-
-"willow_vines" or "jungle_vines"
-
-There are two types of vines. One that spawns at the bottom of nodes and uses the
-plantlike drawtype, and vines that spawn on the side that use signlike
-drawtype. The type is determined by the spawn_on_side property in the biome
-table.
-
-### Example
-*taken from mod*
-
-```lua
-
-  vines.register_vine( name, definitions, biome )
-
-  --e.g.
-
-  vines.register_vine( 'vine', {
-    description = "Vines",
-    average_length = 9
-  }, biome )
-
-```
-
-### definitions
-|key|           type|  description|
-|---|           ---|   ---|
-|description|   string|The vine's tooltip description|
-|average_length|int|   The average length of vines|
-
-For biome definitions please see the [plants_lib API documentation](https://github.com/VanessaE/plantlife_modpack/blob/master/API.txt)
-
-## Notice
-Vines use after_destruct on registered leave nodes to remove vines from which
-the leaves are removed. This is done by using the override function.
-Malfunctions may occur if other mods override the after_destruct of these nodes
-also.

mods/ITEMS/vines/bower.json

@@ -1,18 +0,0 @@
-{
-  "name": "vines",
-  "description": "Vines that spawn on trees and rope",
-  "keywords": [
-    "vines",
-    "trees",
-    "rope",
-    "jungle"
-  ],
-  "homepage": "https://github.com/bas080/vines/",
-  "screenshots": [
-    "https://raw.githubusercontent.com/bas080/vines/forum/screenshot.png"
-  ],
-  "authors": [
-    "bas080"
-  ],
-  "license": "WTFPL"
-}

mods/ITEMS/vines/crafts.lua

@@ -1,17 +0,0 @@
--- support for i18n
-local S = plantlife_i18n.gettext
-
-minetest.register_craft({
-  output = 'vines:rope_block',
-  recipe = vines.recipes['rope_block']
-})
-
-minetest.register_craft({
-  output = 'vines:shears',
-  recipe = vines.recipes['shears']
-})
-
-minetest.register_craftitem("vines:vines", {
-  description = S("Vines"),
-  inventory_image = "vines_item.png",
-})

mods/ITEMS/vines/depends.txt

@@ -1,5 +0,0 @@
-biome_lib
-plantlife_i18n
-base
-default
-moretrees?

mods/ITEMS/vines/description.txt

@@ -1 +0,0 @@
-Adds climbable vines that are spawned on trees.

mods/ITEMS/vines/functions.lua

@@ -1,132 +0,0 @@
--- support for i18n
-local S = plantlife_i18n.gettext
-
-vines.register_vine = function( name, defs, biome )
-  local groups = { vines=1, snappy=3, flammable=2 }
-
-  local vine_name_end = 'vines:'..name..'_end'
-  local vine_name_middle = 'vines:'..name..'_middle'
-
-  local vine_image_end = "vines_"..name.."_end.png"
-  local vine_image_middle = "vines_"..name.."_middle.png"
-
-  local drop_node = vine_name_end
-
-  biome.spawn_plants = { vine_name_end }
-
-  local vine_group = 'group:'..name..'_vines'
-  biome.spawn_surfaces[ #biome.spawn_surfaces + 1 ] = vine_group
-
-  local selection_box = { type = "wallmounted", }
-  local drawtype = 'signlike'
-  if ( not biome.spawn_on_side ) then
-    --different properties for bottom and side vines.
-    selection_box = { type = "fixed", fixed = { -0.4, -1/2, -0.4, 0.4, 1/2, 0.4 }, }
-    drawtype = 'plantlike'
-  end
-
-  minetest.register_node( vine_name_end, {
-    description = defs.description,
-    walkable = false,
-    climbable = true,
-    wield_image = vine_image_end,
-    drop = "",
-    sunlight_propagates = true,
-    paramtype = "light",
-    paramtype2 = "wallmounted",
-    buildable_to = false,
-    tiles = { vine_image_end },
-    drawtype = drawtype,
-    inventory_image = vine_image_end,
-    groups = groups,
-    sounds = default.node_sound_leaves_defaults(),
-    selection_box = selection_box,
-    on_construct = function( pos )
-      local timer = minetest.get_node_timer( pos )
-      timer:start( math.random(5, 10) )
-    end,
-    on_timer = function( pos )
-      local node = minetest.get_node( pos )
-      local bottom = {x=pos.x, y=pos.y-1, z=pos.z}
-      local bottom_node = minetest.get_node( bottom )
-      if bottom_node.name == "air" then
-        if not ( math.random( defs.average_length ) == 1 ) then
-          minetest.set_node( pos, { name = vine_name_middle, param2 = node.param2 } )
-          minetest.set_node( bottom, { name = node.name, param2 = node.param2 } )
-          local timer = minetest.get_node_timer( bottom_node )
-          timer:start( math.random(5, 10) )
-        end
-      end
-    end,
-    after_dig_node = function(pos, node, oldmetadata, user)
-      vines.dig_vine( pos, drop_node, user )
-    end
-  })
-
-  minetest.register_node( vine_name_middle, {
-    description = S("Matured").." "..defs.description,
-    walkable = false,
-    climbable = true,
-    drop = "",
-    sunlight_propagates = true,
-    paramtype = "light",
-    paramtype2 = "wallmounted",
-    buildable_to = false,
-    tiles = { vine_image_middle },
-    wield_image = vine_image_middle,
-    drawtype = drawtype,
-    inventory_image = vine_image_middle,
-    groups = groups,
-    sounds = default.node_sound_leaves_defaults(),
-    selection_box = selection_box,
-    on_destruct = function( pos )
-      local bottom = {x=pos.x, y=pos.y-1, z=pos.z}
-      local bottom_node = minetest.get_node( bottom )
-      if minetest.get_item_group( bottom_node.name, "vines") > 0 then
-        minetest.after( 0, minetest.remove_node, bottom )
-      end
-    end,
-    after_dig_node = function( pos, node, oldmetadata, user )
-      vines.dig_vine( pos, drop_node, user )
-    end
-  })
-
-  biome_lib:spawn_on_surfaces( biome )
-
-  local override_nodes = function( nodes, def )
-  local function override( index, registered )
-      local node = nodes[ index ]
-      if index > #nodes then return registered end
-      if minetest.registered_nodes[node] then
-        minetest.override_item( node, def )
-        registered[#registered+1] = node
-      end
-      override( index+1, registered )
-    end
-    override( 1, {} )
-  end
-
-  override_nodes( biome.spawn_surfaces,{
-    on_destruct = function( pos )
-      local pos_min = { x = pos.x -1, y = pos.y - 1, z = pos.z - 1 }
-      local pos_max = { x = pos.x +1, y = pos.y + 1, z = pos.z + 1 }
-      local positions = minetest.find_nodes_in_area( pos_min, pos_max, "group:vines" )
-      for index, position in pairs(positions) do
-        minetest.remove_node( position )
-      end
-    end
-  })
-
-end
-
-vines.dig_vine = function( pos, node_name, user )
-  --only dig give the vine if shears are used
-  if not user then return false end
-  local wielded = user:get_wielded_item()
-  if 'vines:shears' == wielded:get_name() then
-    local inv = user:get_inventory()
-    if inv then
-      inv:add_item("main", ItemStack( node_name ))
-    end
-  end
-end

mods/ITEMS/vines/init.lua

@@ -1,16 +0,0 @@
-vines = {
-  name = 'vines',
-  recipes = {}
-}
-
--- support for i18n
-local S = plantlife_i18n.gettext
-
-dofile( minetest.get_modpath( vines.name ) .. "/functions.lua" )
-dofile( minetest.get_modpath( vines.name ) .. "/recipes.lua" )
-dofile( minetest.get_modpath( vines.name ) .. "/crafts.lua" )
-dofile( minetest.get_modpath( vines.name ) .. "/nodes.lua" )
-dofile( minetest.get_modpath( vines.name ) .. "/shear.lua" )
-dofile( minetest.get_modpath( vines.name ) .. "/vines.lua" )
-
-print(S("[Vines] Loaded!"))

mods/ITEMS/vines/mod.conf

@@ -1 +0,0 @@
-name = vines

mods/ITEMS/vines/nodes.lua

@@ -1,86 +0,0 @@
--- support for i18n
-local S = plantlife_i18n.gettext
-
-minetest.register_node("vines:rope_block", {
-  description = S("Rope"),
-  sunlight_propagates = true,
-  paramtype = "light",
-  tiles = {
-    "default_wood.png^vines_rope.png",
-    "default_wood.png^vines_rope.png",
-    "default_wood.png",
-    "default_wood.png",
-    "default_wood.png^vines_rope.png",
-    "default_wood.png^vines_rope.png",
-  },
-  groups = { flammable=2, choppy=2, oddly_breakable_by_hand=1 },
-  after_place_node = function(pos)
-    local p = {x=pos.x, y=pos.y-1, z=pos.z}
-    local n = minetest.get_node(p)
-    if n.name == "air" then
-      minetest.add_node(p, {name="vines:rope_end"})
-    end
-  end,
-  after_dig_node = function(pos, node, digger)
-    local p = {x=pos.x, y=pos.y-1, z=pos.z}
-    local n = minetest.get_node(p)
-    while ( n.name == 'vines:rope' or n.name == 'vines:rope_end' ) do
-      minetest.remove_node(p)
-      p = {x=p.x, y=p.y-1, z=p.z}
-      n = minetest.get_node(p)
-    end
-  end
-})
-
-minetest.register_node("vines:rope", {
-  description = S("Rope"),
-  walkable = false,
-  climbable = true,
-  sunlight_propagates = true,
-  paramtype = "light",
-  drop = "",
-  tiles = { "vines_rope.png" },
-  drawtype = "plantlike",
-  groups = {flammable=2, not_in_creative_inventory=1},
-  sounds =  default.node_sound_leaves_defaults(),
-  selection_box = {
-    type = "fixed",
-    fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
-  },
-})
-
-minetest.register_node("vines:rope_end", {
-  description = S("Rope"),
-  walkable = false,
-  climbable = true,
-  sunlight_propagates = true,
-  paramtype = "light",
-  drop = "",
-  tiles = { "vines_rope_end.png" },
-  drawtype = "plantlike",
-  groups = {flammable=2, not_in_creative_inventory=1},
-  sounds =  default.node_sound_leaves_defaults(),
-  after_place_node = function(pos)
-    local yesh  = {x = pos.x, y= pos.y-1, z=pos.z}
-    minetest.add_node(yesh, {name="vines:rope"})
-  end,
-  selection_box = {
-	  type = "fixed",
-	  fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
-  },
-  on_construct = function( pos )
-    local timer = minetest.get_node_timer( pos )
-    timer:start( 1 )
-  end,
-  on_timer = function( pos, elapsed )
-    local p = {x=pos.x, y=pos.y-1, z=pos.z}
-    local n = minetest.get_node(p)
-    if  n.name == "air" then
-      minetest.set_node(pos, {name="vines:rope"})
-      minetest.add_node(p, {name="vines:rope_end"})
-    else
-      local timer = minetest.get_node_timer( pos )
-      timer:start( 1 )
-    end
-  end
-})

mods/ITEMS/vines/recipes.lua

@@ -1,12 +0,0 @@
-vines.recipes['rope_block'] = {
-  {'', 'group:wood', ''},
-  {'', 'group:vines', ''},
-  {'', 'group:vines', ''}
-}
-
-vines.recipes['shears'] = {
-  {'', 'default:steel_ingot', ''},
-  {'group:stick', 'group:wood', 'default:steel_ingot'},
-  {'', '', 'group:stick'}
-}
-

mods/ITEMS/vines/shear.lua

@@ -1,18 +0,0 @@
--- support for i18n
-local S = plantlife_i18n.gettext
-
-minetest.register_tool("vines:shears", {
-  description = S("Shears"),
-  inventory_image = "vines_shears.png",
-  wield_image = "vines_shears.png",
-  stack_max = 1,
-  max_drop_level=3,
-  tool_capabilities = {
-    full_punch_interval = 1.0,
-    max_drop_level=0,
-    groupcaps={
-      snappy={times={[3]=0.2}, uses=60, maxlevel=3},
-      wool={times={[3]=0.2}, uses=60, maxlevel=3}
-    }
-  },
-})

mods/ITEMS/vines/vines.lua

@@ -1,78 +0,0 @@
--- support for i18n
-local S = plantlife_i18n.gettext
-
-vines.register_vine( 'root', {
-  description = S("Roots"),
-  average_length = 9,
-},{
-  choose_random_wall = true,
-  avoid_nodes = {"vines:root_middle"},
-  avoid_radius = 5,
-  spawn_delay = 500,
-  spawn_chance = 10,
-  spawn_surfaces = {
-    "default:dirt_with_grass",
-    "default:dirt"
-  },
-  spawn_on_bottom = true,
-  plantlife_limit = -0.6,
-  humidity_min = 0.4,
-})
-
-vines.register_vine( 'vine', {
-  description = S("Vines"),
-  average_length = 5,
-},{
-  choose_random_wall = true,
-  avoid_nodes = {"group:vines"},
-  avoid_radius = 5,
-  spawn_delay = 500,
-  spawn_chance = 100,
-  spawn_surfaces = {
-    "base:merbau_leaves"
-  },
-  spawn_on_bottom = true,
-  plantlife_limit = -0.9,
-  humidity_min = 0.7,
-})
-
-vines.register_vine( 'side', {
-  description = S("Vines"),
-  average_length = 6,
-},{
-  choose_random_wall = true,
-  avoid_nodes = {"group:vines", "default:apple"},
-  avoid_radius = 3,
-  spawn_delay = 500,
-  spawn_chance = 100,
-  spawn_surfaces = {
-    "base:merbau_leaves"
-  },
-  spawn_on_side = true,
-  plantlife_limit = -0.9,
-  humidity_min = 0.4,
-})
-
-vines.register_vine( "merbau", {
-  description = S("Rainforest Vines"),
-  average_length = 7,
-},{
-  choose_random_wall = true,
-  neighbors = {
-    "base:merbau_leaves"
-  },
-  avoid_nodes = {
-    "vines:merbau_middle",
-    "vines:merbau_end",
-  },
-  avoid_radius = 5,
-  spawn_delay = 500,
-  spawn_chance = 100,
-  spawn_surfaces = {
-    "base:merbau_tree"
-  },
-  spawn_on_side = true,
-  plantlife_limit = -0.9,
-  humidity_min = 0.2,
-})
-