Merge pull request #11 from PureTryOut/items

Removed everything obsidian except the main block and removed river water.

mods/default/README.txt

@@ -59,8 +59,6 @@ Jordach (CC BY-SA 3.0):
 PilzAdam (CC BY-SA 3.0):
   default_jungleleaves.png
   default_junglesapling.png
-  default_obsidian_glass.png
-  default_obsidian_shard.png
   default_mineral_gold.png
 
 jojoa1997 (CC BY-SA 3.0):
@@ -90,16 +88,11 @@ paramat (CC BY-SA 3.0):
   default_junglewood.png
   default_jungletree_top.png
   default_sandstone_brick.png
-  default_obsidian_brick.png
   default_stone_brick.png
   default_desert_stone_brick.png
   default_sandstone_block.png
-  default_obsidian_block.png
   default_stone_block.png
   default_desert_stone_block.png
-  default_river_water.png
-  default_river_water_source_animated.png
-  default_river_water_flowing_animated.png
   default_dry_grass.png
   default_dry_grass_side.png
   default_dry_grass_*.png

mods/default/crafting.lua

@@ -441,39 +441,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'default:obsidian_shard 9',
-	recipe = {
-		{'default:obsidian'}
-	}
-})
-
-minetest.register_craft({
-	output = 'default:obsidian',
-	recipe = {
-		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
-		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
-		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
-	}
-})
-
-minetest.register_craft({
-	output = 'default:obsidianbrick 4',
-	recipe = {
-		{'default:obsidian', 'default:obsidian'},
-		{'default:obsidian', 'default:obsidian'}
-	}
-})
-
-minetest.register_craft({
-	output = 'default:obsidian_block 9',
-	recipe = {
-		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
-		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
-		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
-	}
-})
-
 minetest.register_craft({
 	output = 'default:stonebrick 4',
 	recipe = {
@@ -542,12 +509,6 @@ minetest.register_craft({
 	recipe = "group:sand",
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "default:obsidian_glass",
-	recipe = "default:obsidian_shard",
-})
-
 minetest.register_craft({
 	type = "cooking",
 	output = "default:stone",

mods/default/craftitems.lua

@@ -203,11 +203,6 @@ minetest.register_craftitem("default:clay_brick", {
 	inventory_image = "default_clay_brick.png",
 })
 
-minetest.register_craftitem("default:obsidian_shard", {
-	description = "Obsidian Shard",
-	inventory_image = "default_obsidian_shard.png",
-})
-
 minetest.register_craftitem("default:flint", {
 	description = "Flint",
 	inventory_image = "default_flint.png"

mods/default/mapgen.lua

@@ -7,7 +7,6 @@ minetest.register_alias("mapgen_dirt", "default:dirt")
 minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_sand", "default:sand")
 minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_river_water_source", "default:river_water_source")
 minetest.register_alias("mapgen_lava_source", "default:lava_source")
 minetest.register_alias("mapgen_gravel", "default:gravel")
 minetest.register_alias("mapgen_desert_stone", "default:desert_stone")

mods/default/nodes.lua

@@ -32,8 +32,6 @@ default:sandstonebrick
 default:sandstone_block
 
 default:obsidian
-default:obsidianbrick
-default:obsidian_block
 
 Soft / Non-Stone
 ----------------
@@ -138,9 +136,6 @@ Liquids
 default:water_source
 default:water_flowing
 
-default:river_water_source
-default:river_water_flowing
-
 default:lava_source
 default:lava_flowing
 
@@ -165,7 +160,6 @@ default:fence_pine_wood
 default:fence_aspen_wood
 
 default:glass
-default:obsidian_glass
 
 default:rail
 
@@ -295,24 +289,6 @@ minetest.register_node("default:obsidian", {
 	groups = {cracky = 1, level = 2},
 })
 
-minetest.register_node("default:obsidianbrick", {
-	description = "Obsidian Brick",
-	paramtype2 = "facedir",
-	place_param2 = 0,
-	tiles = {"default_obsidian_brick.png"},
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-	groups = {cracky = 1, level = 2},
-})
-
-minetest.register_node("default:obsidian_block", {
-	description = "Obsidian Block",
-	tiles = {"default_obsidian_block.png"},
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-	groups = {cracky = 1, level = 2},
-})
-
 --
 -- Soft / Non-Stone
 --
@@ -1284,99 +1260,6 @@ minetest.register_node("default:water_flowing", {
 })
 
 
-minetest.register_node("default:river_water_source", {
-	description = "River Water Source",
-	drawtype = "liquid",
-	tiles = {
-		{
-			name = "default_river_water_source_animated.png",
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 2.0,
-			},
-		},
-	},
-	special_tiles = {
-		{
-			name = "default_river_water_source_animated.png",
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 2.0,
-			},
-			backface_culling = false,
-		},
-	},
-	alpha = 160,
-	paramtype = "light",
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	is_ground_content = false,
-	drop = "",
-	drowning = 1,
-	liquidtype = "source",
-	liquid_alternative_flowing = "default:river_water_flowing",
-	liquid_alternative_source = "default:river_water_source",
-	liquid_viscosity = 1,
-	liquid_renewable = false,
-	liquid_range = 2,
-	post_effect_color = {a = 103, r = 30, g = 76, b = 90},
-	groups = {water = 3, liquid = 3, puts_out_fire = 1},
-})
-
-minetest.register_node("default:river_water_flowing", {
-	description = "Flowing River Water",
-	drawtype = "flowingliquid",
-	tiles = {"default_river_water.png"},
-	special_tiles = {
-		{
-			name = "default_river_water_flowing_animated.png",
-			backface_culling = false,
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 0.8,
-			},
-		},
-		{
-			name = "default_river_water_flowing_animated.png",
-			backface_culling = true,
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 0.8,
-			},
-		},
-	},
-	alpha = 160,
-	paramtype = "light",
-	paramtype2 = "flowingliquid",
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	is_ground_content = false,
-	drop = "",
-	drowning = 1,
-	liquidtype = "flowing",
-	liquid_alternative_flowing = "default:river_water_flowing",
-	liquid_alternative_source = "default:river_water_source",
-	liquid_viscosity = 1,
-	liquid_renewable = false,
-	liquid_range = 2,
-	post_effect_color = {a = 103, r = 30, g = 76, b = 90},
-	groups = {water = 3, liquid = 3, puts_out_fire = 1,
-		not_in_creative_inventory = 1},
-})
-
-
 minetest.register_node("default:lava_source", {
 	description = "Lava Source",
 	drawtype = "liquid",
@@ -1878,17 +1761,6 @@ minetest.register_node("default:glass", {
 	sounds = default.node_sound_glass_defaults(),
 })
 
-minetest.register_node("default:obsidian_glass", {
-	description = "Obsidian Glass",
-	drawtype = "glasslike_framed_optional",
-	tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	sunlight_propagates = true,
-	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky = 3},
-})
-
 
 minetest.register_node("default:rail", {
 	description = "Rail",

mods/doors/depends.txt

@@ -1,2 +1 @@
 default
-screwdriver?

mods/doors/init.lua

@@ -19,7 +19,8 @@ function doors.get(pos)
 				end
 				return _doors.door_toggle(self.pos, nil, player)
 			end,
-			close = function(self, player)
+			close =
+			 function(self, player)
 				if not self:state() then
 					return false
 				end
@@ -447,21 +448,6 @@ doors.register("door_glass", {
 		}
 })
 
-doors.register("door_obsidian_glass", {
-		tiles = {"doors_door_obsidian_glass.png"},
-		description = "Obsidian Glass Door",
-		inventory_image = "doors_item_obsidian_glass.png",
-		groups = {cracky=3},
-		sounds = default.node_sound_glass_defaults(),
-		sound_open = "doors_glass_door_open",
-		sound_close = "doors_glass_door_close",
-		recipe = {
-			{"default:obsidian_glass", "default:obsidian_glass"},
-			{"default:obsidian_glass", "default:obsidian_glass"},
-			{"default:obsidian_glass", "default:obsidian_glass"},
-		},
-})
-
 -- Capture mods using the old API as best as possible.
 function doors.register_door(name, def)
 	if def.only_placer_can_open then

mods/stairs/init.lua

@@ -416,36 +416,6 @@ stairs.register_stair_and_slab(
 	default.node_sound_stone_defaults()
 )
 
-stairs.register_stair_and_slab(
-	"obsidian",
-	"default:obsidian",
-	{cracky = 1, level = 2},
-	{"default_obsidian.png"},
-	"Obsidian Stair",
-	"Obsidian Slab",
-	default.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"obsidianbrick",
-	"default:obsidianbrick",
-	{cracky = 1, level = 2},
-	{"default_obsidian_brick.png"},
-	"Obsidian Brick Stair",
-	"Obsidian Brick Slab",
-	default.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"obsidian_block",
-	"default:obsidian_block",
-	{cracky = 1, level = 2},
-	{"default_obsidian_block.png"},
-	"Obsidian Block Stair",
-	"Obsidian Block Slab",
-	default.node_sound_stone_defaults()
-)
-
 stairs.register_stair_and_slab(
 	"brick",
 	"default:brick",