Add files via upload

craftitems.csv

@@ -1,2 +1,40 @@
-#Craft Item|Craft Description|Craft Image|Craft Groups
-bowl|Bowl|bowl.png|
+#Craft Item|Craft Description|Craft Image|Craft Groups|Eat
+item_candle|Candle|lib_ecology_item_candle.png||
+item_wax_palm|Palm Wax|lib_ecology_item_wax_palm.png||
+item_ointment|Ointment|lib_ecology_item_ointment.png||
+item_paper|Paper|lib_ecology_item_paper.png||
+item_legendary_paper|Legendary Paper|lib_ecology_item_legendary_paper.png||
+item_wall_paper|Paper Wall|lib_ecology_item_paper_wall.png||
+item_string_cotton|Cotton String|lib_ecology_item_string_cotton.png||
+item_light_string|Light String|lib_ecology_item_lightstring.png||
+item_cotton|Cotton Ball|lib_ecology_item_cotton.png||
+item_hay_bundle|Bundle of Hay|lib_ecology_item_hay_bundle.png||
+item_straw_bundle|Bundle of Straw|lib_ecology_item_straw_bundle.png||
+item_seed_cotton|Seed - Cotton|lib_ecology_plant_cotton_seed.png||
+item_bowl|Bowl|lib_ecology_item_bowl.png||
+food_bowl_applesauce|Bowl of Applesauce|lib_ecology_food_bowl_applesauce.png||
+food_bowl_chocolate|Bowl of Chocolate|lib_ecology_food_bowl_chocolate.png||
+food_bowl_hearty_stew|Bowl of Hearty Stew|lib_ecology_food_bowl_hearty_stew.png||
+food_bowl_mushroom_soup|Bowl of Mushroom Soup|lib_ecology_food_bowl_mushroom_soup.png||
+food_bowl_mushroom_stew|Bowl of Mushroom Stew|lib_ecology_food_bowl_stew_mushroom.png||
+food_bucket_cactus_pulp|Bucket of Cactus Pulp|lib_ecology_food_bucket_cactus_pulp.png||
+food_acorn_muffin_batter|Acorn Muffin batter|lib_ecology_food_acorn_muffin_batter.png||
+food_acorn_muffin|Acorn Muffin|lib_ecology_food_acorn_muffin.png||4
+food_banana_bread|Banana Bread|lib_ecology_food_banana_bread.png||6
+food_banana_dough|Banana Dough|lib_ecology_food_banana_dough.png||
+food_candy_ancient|Ancient Candy|lib_ecology_food_ancient_candy.png||
+food_candied_apple|Candied Apple|lib_ecology_food_apple_candied.png||
+food_chocolate_bar|Chocolate Bar|lib_ecology_food_chocolate_bar.png||
+food_cookie_chocolate_chip|Chocolate Chip Cookie|lib_ecology_food_cookie_chocolate_chip.png||
+food_coconut_milk|Coconut Milk|lib_ecology_food_coconut_milk_inv.png||1
+food_raw_coconut|Raw Coconut|lib_ecology_food_coconut_raw.png||2
+food_coconut_slice|Coconut Slice|lib_ecology_food_coconut_slice.png||4
+food_date|Date|lib_ecology_food_date.png||2
+food_date_nut_batter|Date-nut cake batter|lib_ecology_food_date_nut_batter.png||
+food_date_nut_cake|Date-nut cake|lib_ecology_food_date_nut_cake.png||32
+food_date_nut_bar|Date-nut energy bar|lib_ecology_food_date_nut_bar.png||4
+food_date_nut_snack|Date & nut snack|lib_ecology_food_date_nut_snack.png||4
+food_cedar_nuts|Roasted Cedar Cone Nuts|lib_ecology_food_cedar_nuts.png||2
+food_fir_nuts|Roasted Fir Cone Nuts|lib_ecology_food_fir_nuts.png||2
+food_spruce_nuts|Roasted Spruce Cone Nuts|lib_ecology_food_spruce_nuts.png||2
+food_flour|Flour|lib_ecology_food_flour.png||

init.lua

@@ -88,7 +88,7 @@ minetest.log(S("[MOD]: lib_ecology:  Loading..."))
 		--dofile(lib_ecology.path .. "/lib_ecology_water_mechanics.lua")
 
 -- Prevent rivers from flowing through (the air in) caves.
-	minetest.override_item("default:river_water_source", {is_ground_content = true})
+	--minetest.override_item("default:river_water_source", {is_ground_content = true})
 
 		--dofile(lib_ecology.path.."/lib_ecology_plant.lua")
 
@@ -123,7 +123,7 @@ minetest.log(S("[MOD]: lib_ecology:  Loading..."))
 		--dofile(lib_ecology.path.."/valleys_c/deco_water.lua")
 
 
-	dofile(lib_ecology.path.."/lib_ecology_extra.lua")
+	--dofile(lib_ecology.path.."/lib_ecology_extra.lua")
 
 		--dofile(lib_ecology.path .. "/lib_ecology_seedling.lua")
 
@@ -139,14 +139,14 @@ minetest.log(S("[MOD]: lib_ecology:  Loading..."))
 
 
 --v6 Mapgen Aliases
-	minetest.register_alias("mapgen_tree", "lib_ecology:tree_default_trunk")
-	minetest.register_alias("mapgen_leaves", "lib_ecology:tree_default_leaves")
-	minetest.register_alias("mapgen_apple", "lib_ecology:fruit_apple")
-	minetest.register_alias("mapgen_jungletree", "lib_ecology:tree_jungle_01_trunk")
-	minetest.register_alias("mapgen_jungleleaves", "lib_ecology:tree_jungle_01_leaves")
-	minetest.register_alias("mapgen_junglegrass", "lib_ecology:shrub_jungle")
-	minetest.register_alias("mapgen_pine_tree", "lib_ecology:tree_pine_01_trunk")
-	minetest.register_alias("mapgen_pine_needles", "lib_ecology:tree_pine_01_leaves")
+	--minetest.register_alias("mapgen_tree", "lib_ecology:tree_default_trunk")
+	--minetest.register_alias("mapgen_leaves", "lib_ecology:tree_default_leaves")
+	--minetest.register_alias("mapgen_apple", "lib_ecology:fruit_apple")
+	--minetest.register_alias("mapgen_jungletree", "lib_ecology:tree_jungle_01_trunk")
+	--minetest.register_alias("mapgen_jungleleaves", "lib_ecology:tree_jungle_01_leaves")
+	--minetest.register_alias("mapgen_junglegrass", "lib_ecology:shrub_jungle")
+	--minetest.register_alias("mapgen_pine_tree", "lib_ecology:tree_pine_01_trunk")
+	--minetest.register_alias("mapgen_pine_needles", "lib_ecology:tree_pine_01_leaves")
 
 
 

lib_ecology_deco_registration.lua

@@ -151,52 +151,6 @@ local add_water_node = function(a, b, c, d, e, f, g, h, i)
 end
 
 
-
-for i, deco in ipairs(lib_ecology.read_csv("|", lib_ecology.path .. "/decorations.csv")) do
-
-	--#Deco_Type, Place_On, FillRatio, Biome, Y_Min, Y_Max, Deco_Node, HeightMax, SpawnBy, NumSpawnBy
-	local decotype, placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby = unpack(deco)
-
-
-	--minetest.log(S("[MOD] lib_ecology: " .. decotype .. "; " .. placeon .. "; " .. biome .. "; " .. deconode))
-
-
-	if decotype then
-		if decotype ~= "" then
-			if decotype == "node" then
-				add_node(placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby)
-			end
-
-			if decotype == "water_node" then
-				add_node(placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby)
-			end
-
-			if decotype == "schem" then
-				if heightmax == "" then
-					add_schem(placeon, fillratio, biome, ymin, ymax, deconode)
-				else
-					add_schem(placeon, fillratio, biome, ymin, ymax, deconode, heightmax)
-				end
-			end
-
-			if decotype == "no_rot" then
-				if heightmax == "" then
-					add_schem_no_rot(placeon, fillratio, biome, ymin, ymax, deconode)
-				else
-					add_schem_no_rot(placeon, fillratio, biome, ymin, ymax, deconode, heightmax)
-				end
-
-			if decotype == "water_schem" then
-				add_schem(placeon, fillratio, biome, ymin, ymax, deconode)
-			end
-
-			end
-		end
-	end
-
-end
-
-
 -- Coral reefs
 	minetest.register_decoration({
 		name = "lib_ecology:corals_1",
@@ -476,24 +430,25 @@ end
 		deco_type = "simple",
 		place_on = {"lib_materials:dirt_mud_01"},
 		place_offset_y = -1,
-		sidelen = 4,
-		noise_params = {
-			offset = -0.004,
-			scale = 0.1,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 87112,
-			octaves = 3,
-			persist = 0.7
-		},
+		sidelen = 16,
+		fill_ratio = 0.7,
+--		noise_params = {
+--			offset = -0.004,
+--			scale = 0.1,
+--			spread = {x = 200, y = 200, z = 200},
+--			seed = 87112,
+--			octaves = 3,
+--			persist = 0.7
+--		},
 		biomes = {
 			"lib_ecology_deciduous_forest_swamp",
 			"lib_materials_subtropical_rainforest_swamp",
 			"lib_materials_temperate_rainforest_swamp"
 		},
-		y_max = 0,
-		y_min = -3,
+		y_max = 1,
+		y_min = 0,
 		flags = "force_placement",
-		decoration = {"lib_ecology:plant_reedmace_water", "lib_ecology:plant_reedmace_sapling_water"},
+		decoration = {"lib_ecology:plant_reedmace_water", "lib_ecology:plant_reedmace_sapling_water"},
 		param2 = 48,
 		param2_max = 96,
 	})
@@ -504,22 +459,23 @@ end
 		deco_type = "simple",
 		place_on = {"lib_materials:dirt_silt_01"},
 		place_offset_y = -1,
-		sidelen = 4,
-		noise_params = {
-			offset = -0.004,
-			scale = 0.1,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 87112,
-			octaves = 3,
-			persist = 0.7
-		},
+		sidelen = 16,
+		fill_ratio = 0.7,
+--		noise_params = {
+--			offset = -0.004,
+--			scale = 0.1,
+--			spread = {x = 200, y = 200, z = 200},
+--			seed = 87112,
+--			octaves = 3,
+--			persist = 0.7
+--		},
 		biomes = {
 			"hot_humid_beach",
 			"hot_semihumid_beach",
 			"warm_humid_beach"
 		},
-		y_max = 0,
-		y_min = -3,
+		y_max = 1,
+		y_min = 0,
 		flags = "force_placement",
 		decoration = {"lib_ecology:tree_mangrove_root"},
 		param2 = 48,
@@ -528,6 +484,49 @@ end
 
 
 
+for i, deco in ipairs(lib_ecology.read_csv("|", lib_ecology.path .. "/decorations.csv")) do
+
+	--#Deco_Type, Place_On, FillRatio, Biome, Y_Min, Y_Max, Deco_Node, HeightMax, SpawnBy, NumSpawnBy
+	local decotype, placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby = unpack(deco)
+
+
+	--minetest.log(S("[MOD] lib_ecology: " .. decotype .. "; " .. placeon .. "; " .. biome .. "; " .. deconode))
+
+
+	if decotype then
+		if decotype ~= "" then
+			if decotype == "node" then
+				add_node(placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby)
+			end
+
+			if decotype == "water_node" then
+				add_node(placeon, fillratio, biome, ymin, ymax, deconode, heightmax, spawnby, numspawnby)
+			end
+
+			if decotype == "schem" then
+				if heightmax == "" then
+					add_schem(placeon, fillratio, biome, ymin, ymax, deconode)
+				else
+					add_schem(placeon, fillratio, biome, ymin, ymax, deconode, heightmax)
+				end
+			end
+
+			if decotype == "no_rot" then
+				if heightmax == "" then
+					add_schem_no_rot(placeon, fillratio, biome, ymin, ymax, deconode)
+				else
+					add_schem_no_rot(placeon, fillratio, biome, ymin, ymax, deconode, heightmax)
+				end
+
+			if decotype == "water_schem" then
+				add_schem(placeon, fillratio, biome, ymin, ymax, deconode)
+			end
+
+			end
+		end
+	end
+
+end
 
 
 

lib_ecology_node_registration.lua

@@ -672,37 +672,70 @@ for i, stone in ipairs(lib_ecology.read_csv("|", lib_ecology.path .. "/nodes.csv
 	local RADIUS = 6
 
 	if string.find(node_name, "_leaves") then
-		new_node_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
-			if placer and placer:is_player() and not placer:get_player_control().sneak then
+		if string.find(node_name, "_tree_leaves") then
+			new_node_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
+				if placer and placer:is_player() and not placer:get_player_control().sneak then
+					local node = minetest.get_node(pos)
+					node.param2 = 1
+					minetest.set_node(pos, node)
+				end
+			end
+			new_node_def.on_timer = function(pos)
 				local node = minetest.get_node(pos)
-				node.param2 = 1
-				minetest.set_node(pos, node)
-			end
-		end
-		new_node_def.on_timer = function(pos)
-			if minetest.find_node_near(pos, RADIUS, "lib_ecology:tree_"..node_name.."_trunk") then
-				return false
-			end
-			local node = minetest.get_node(pos)
-			local drops = minetest.get_node_drops(node.name)
-			for _, item in ipairs(drops) do
-				local is_leaf
-				for _, v in pairs({"lib_ecology:"..node_name..""}) do
-					if v == item then
-						is_leaf = true
+				local drops = minetest.get_node_drops(node.name)
+				for _, item in ipairs(drops) do
+					local is_leaf
+					for _, v in pairs({"lib_ecology:"..node_name..""}) do
+						if v == item then
+							is_leaf = true
+						end
+					end
+					if minetest.get_item_group(item, "leafdecay_drop") ~= 0 or
+							not is_leaf then
+						minetest.add_item({
+							x = pos.x - 0.5 + math.random(),
+							y = pos.y - 0.5 + math.random(),
+							z = pos.z - 0.5 + math.random(),
+						}, item)
 					end
 				end
-				if minetest.get_item_group(item, "leafdecay_drop") ~= 0 or
-						not is_leaf then
-					minetest.add_item({
-						x = pos.x - 0.5 + math.random(),
-						y = pos.y - 0.5 + math.random(),
-						z = pos.z - 0.5 + math.random(),
-					}, item)
+				minetest.remove_node(pos)
+				minetest.check_for_falling(pos)
+			end
+
+		else
+			new_node_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
+				if placer and placer:is_player() and not placer:get_player_control().sneak then
+					local node = minetest.get_node(pos)
+					node.param2 = 1
+					minetest.set_node(pos, node)
 				end
 			end
-			minetest.remove_node(pos)
-			minetest.check_for_falling(pos)
+			new_node_def.on_timer = function(pos)
+				if minetest.find_node_near(pos, RADIUS, "lib_ecology:tree_"..node_name.."_trunk") then
+					return false
+				end
+				local node = minetest.get_node(pos)
+				local drops = minetest.get_node_drops(node.name)
+				for _, item in ipairs(drops) do
+					local is_leaf
+					for _, v in pairs({"lib_ecology:"..node_name..""}) do
+						if v == item then
+							is_leaf = true
+						end
+					end
+					if minetest.get_item_group(item, "leafdecay_drop") ~= 0 or
+							not is_leaf then
+						minetest.add_item({
+							x = pos.x - 0.5 + math.random(),
+							y = pos.y - 0.5 + math.random(),
+							z = pos.z - 0.5 + math.random(),
+						}, item)
+					end
+				end
+				minetest.remove_node(pos)
+				minetest.check_for_falling(pos)
+			end
 		end
 	end
 
@@ -757,13 +790,48 @@ for i, stone in ipairs(lib_ecology.read_csv("|", lib_ecology.path .. "/nodes.csv
 	--game.lib.node.register("lib_ecology:"..node_name.."", new_node_def)
 	--game.lib.node.register_alias("lib_ecology", node_name, alias_mod, alias_node)
 
-	--if ((string.find(node_name, "_allface") or string.find(node_name, "_trunk") or string.find(node_name, "_wood")) and string.find(node_name, "tree_")) and not string.find(node_name, "plant") then
-	if (string.find(node_name, "_allface") and string.find(node_name, "tree_")) and not string.find(node_name, "plant") then
-		if minetest.global_exists("lib_shapes") then
-			--lib_shapes.register_basic_set("lib_ecology:"..node_name.."")
-			--lib_shapes.register_fancy_set("lib_ecology:"..node_name.."")
-			lib_shapes.register_doors_set("lib_ecology:"..node_name.."")
-			lib_shapes.register_furniture_set("lib_ecology:"..node_name.."")
+	if minetest.global_exists("lib_shapes") then
+		if not string.find(node_name, "plant") then
+			--if ((string.find(node_name, "_allface") or string.find(node_name, "_trunk") or string.find(node_name, "_wood")) and string.find(node_name, "tree_")) and not string.find(node_name, "plant") then
+			if (string.find(node_name, "_allface") and string.find(node_name, "tree_")) then
+				if string.find(node_name, "_beech") or string.find(node_name, "_oak") or string.find(node_name, "_pine") or string.find(node_name, "_frost") or string.find(node_name, "_acacia")
+				    or string.find(node_name, "_cedar") or string.find(node_name, "_maple") or string.find(node_name, "_palm") or string.find(node_name, "_jungle") or string.find(node_name, "_cherry")
+				    or string.find(node_name, "_healing") then
+					--lib_shapes.register_basic_set("lib_ecology:"..node_name.."")
+					--lib_shapes.register_fancy_set("lib_ecology:"..node_name.."")
+					--lib_shapes.register_doors_set("lib_ecology:"..node_name.."")
+					--lib_shapes.register_furniture_set("lib_ecology:"..node_name.."")
+					lib_shapes.register_furniture_node("lib_ecology:"..node_name.."", "bed_simple")
+					lib_shapes.register_furniture_node("lib_ecology:"..node_name.."", "chair_basic_01")
+					lib_shapes.register_furniture_node("lib_ecology:"..node_name.."", "table_basic_01")
+				end
+			end
+			if (string.find(node_name, "_wood") and string.find(node_name, "tree_")) then
+				if string.find(node_name, "_beech") or string.find(node_name, "_oak") or string.find(node_name, "_pine") or string.find(node_name, "_frost") or string.find(node_name, "_acacia")
+				    or string.find(node_name, "_cedar") or string.find(node_name, "_maple") or string.find(node_name, "_palm") or string.find(node_name, "_jungle") or string.find(node_name, "_cherry")
+				    or string.find(node_name, "_healing") or string.find(node_name, "_default") then
+					--lib_shapes.register_doors_set("lib_ecology:"..node_name.."")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered_right")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered_with_window")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered_with_window_right")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered_sliding")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "door_centered_sliding_right")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "fencegate_centered")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "fencegate_centered_right")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "trapdoor_solid")
+					lib_shapes.register_door_node("lib_ecology:"..node_name.."", "trapdoor_with_window")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "stairs")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "stairs_inner")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "stairs_outer")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "slab")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "ceiling")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "wall")
+					lib_shapes.register_node("lib_ecology:"..node_name.."", "wall_centered")
+					lib_shapes.register_fence_node("lib_ecology:"..node_name.."", "fence")
+					lib_shapes.register_fence_node("lib_ecology:"..node_name.."", "fence_stone_cobble_post")
+				end
+			end
 		end
 	end