Protect nodes from being overwritten by mapgen (#12)

* more detailed dep checks for recipes

* remove (opt-) depends on default

Co-authored-by: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>

.gitignore

@@ -0,0 +1 @@
+*~

README.md

@@ -1,7 +1,36 @@
-Jumping
+# Jumping
 
-Jumping is a mod for minetest that adds trampolines, cushions, ...
+Jumping is a mod for Minetest that adds trampolines of different power levels, and cushions! The trampolines allow you to jump higher, while the cushions let you fall farther and not take as much damage.
 
-License: GPLv3
+## Recipes
+### Cushion
+![Cushion Recipe](textures/.example/cushion_recipe.png)
 
-Creator: Jeija
+* ![Cotton](textures/.example/farming_cotton.png) - Cotton
+
+* ![Wool (can be any colour)](textures/.example/wool.png) - Wool (can be any colour, as long as it is wool)
+
+The wool can be any colour, however, different coloured cushions and trampolines will soon be added creating a use for the different colours of wool.
+
+Two wool is required because you would probably want as much "cushioning" as possible in a cushion. The cotton is meant as an outline creating the cloth surrounding the wool.
+
+### Trampoline
+![Trampoline Recipe](textures/.example/trampoline_recipe.png)
+
+* ![Steel Ingot](textures/.example/default_steel_ingot.png) - Steel Ingot
+
+* ![Cushion](textures/.example/jumping_cushion.png) - Cushion
+
+When coloured cushions are implemented, colour will become not only an indicator to show how bouncy the trampoline is, but also a decoration on the top. You can also look at the InfoText to find the value showing how bouncy said trampoline is. This is called the "bouncy level."
+
+To change the bouncy level, simply left click (punch) any trampoline. This will increase the bouncy level by 1 until 6. Right click to decrease the bouncy level by 1, until 1.
+
+The steel ingots are used for the legs, while the cushions are obviously acting as the canvas. In fact, when some type of canvas is added, it will be used instead for the trampoline recipe. 
+
+## Development Repositories
+* **Jeija **: [Jeija/minetest-mod-jumping](http://github.com/Jeija/minetest-mod-jumping)
+
+## License and Information
+**License**: [GPLv3](http://www.gnu.org/licenses/gpl-3.0.en.html)
+
+**Creator**: [Jeija](http://github.com/Jeija)

init.lua

@@ -7,43 +7,61 @@ local trampolinebox = {
 		{ 0.4, -0.5, -0.5,  0.5, -0.2, -0.4},
 		{ 0.4, -0.5,  0.4,  0.5, -0.2,  0.5},
 		{-0.5, -0.5,  0.4, -0.4, -0.2,  0.5},
-		}
+	}
 }
 
 local cushionbox = {
 	type = "fixed",
 	fixed = {
 		{-0.5, -0.5, -0.5,  0.5, -0.3,  0.5},
-		}
+	}
 }
 
 local trampoline_punch = function(pos, node)
 	local id = string.sub(node.name, #node.name)
-	id = id + 1
-	if id == 7 then id = 1 end
-	minetest.add_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id})
+	if id < "6" then
+		id = id + 1
+		minetest.swap_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id})
+		minetest.get_meta(pos):set_string("infotext", "Bouncy Level: "..id)
+	end
 end
 
-local u = 6
+local power_decrease = function(pos, node)
+	local id = string.sub(node.name, #node.name)
+	if id > "1" then
+		id = id - 1
+		minetest.swap_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id})
+		minetest.get_meta(pos):set_string("infotext", "Bouncy Level: "..id)
+	end
+end
 
-local bounces = {90, 100, 110, 120, 130, 140}
-
-for i = 1, u do
-	local bnc_pct = bounces[i]
-	minetest.register_node("jumping:trampoline_" .. i, {
-		description = "Trampoline (bounce : " .. bnc_pct .. "%)",
+local use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or nil
+for i = 1, 6 do
+	minetest.register_node("jumping:trampoline"..i, {
+		description = "Trampoline",
 		drawtype = "nodebox",
 		node_box = trampolinebox,
 		selection_box = trampolinebox,
 		paramtype = "light",
+		on_construct = function(pos)
+			minetest.get_meta(pos):set_string("infotext", "Bouncy Level: "..i)
+		end,
 		on_punch = trampoline_punch,
+		on_rightclick = power_decrease,
+		drop = "jumping:trampoline1",
+		use_texture_alpha = use_texture_alpha,
 		tiles = {
 			"jumping_trampoline_top.png",
 			"jumping_trampoline_bottom.png",
-			"jumping_trampoline_sides.png^jumping_trampoline_sides_overlay_" .. i .. ".png",
+			"jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png"
+		},
+		is_ground_content = false,
+		groups = {
+			dig_immediate = 2,
+			bouncy = 20 + i * 20,
+			fall_damage_add_percent = -70,
+			not_in_creative_inventory = ( i > 1 and 1 or nil),
 		},
-		drop = "jumping:trampoline_1",
-		groups = {dig_immediate = 2, bouncy = bnc_pct, fall_damage_add_percent = -95},
 	})
 end
 
@@ -53,32 +71,34 @@ minetest.register_node("jumping:cushion", {
 	node_box = cushionbox,
 	selection_box = cushionbox,
 	paramtype = "light",
+	use_texture_alpha = use_texture_alpha,
 	tiles = {
 		"jumping_cushion_tb.png",
 		"jumping_cushion_tb.png",
-		"jumping_cushion_sides.png",
+		"jumping_cushion_sides.png"
 	},
-	groups = {dig_immediate = 2, disable_jump = 1, fall_damage_add_percent = -100},
+	is_ground_content = false,
+	groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100},
 })
 
-minetest.register_craft({
-	output = "jumping:trampoline_1",
-	recipe = {
-		{"group:ingot", "group:ingot", "group:ingot"},
-		{"default:leaves", "default:leaves", "default:leaves"},
-		{"default:stick", "default:stick", "default:stick"},
-	}
-})
-
-minetest.register_craft({
-	output = "jumping:cushion",
-	recipe = {
-		{"default:junglegrass", "default:junglegrass", "default:junglegrass"},
-		{"default:leaves", "default:leaves", "default:leaves"},
-		{"default:stick", "default:stick", "default:stick"},
-	}
-})
-
-if minetest.setting_getbool("log_mods") then
-	minetest.log("action", "Carbone: [jumping] loaded.")
+-- register recipes if the corresponding mods are present
+if minetest.get_modpath("default") then
+	minetest.register_craft({
+		output = "jumping:trampoline1",
+		recipe = {
+			{"jumping:cushion", "jumping:cushion", "jumping:cushion"},
+			{"default:steel_ingot", "", "default:steel_ingot"}
+		}
+	})
+end
+
+if minetest.get_modpath("farming") and minetest.get_modpath("wool") then
+	minetest.register_craft({
+		output = "jumping:cushion",
+		recipe = {
+			{"farming:cotton", "group:wool", "farming:cotton"},
+			{"farming:cotton", "group:wool", "farming:cotton"},
+			{"farming:cotton", "farming:cotton", "farming:cotton"}
+		}
+	})
 end

mod.conf

@@ -0,0 +1,2 @@
+name = jumping
+description = adds trampolines, cushions, ...