[sea] Update for #445

mods/sea/LICENSE.txt

@@ -1,63 +1,3 @@
--------------------------------------------------------------------------------------------------
-sea-modpack
--------------------------------------------------------------------------------------------------
-
-Version 0.4.0
-
-- clams  -->  collect algae for seaglass and crushed white shells for blocks
-- noairblocks  -->  removes the airblocks around seacorals, seaplants and sealamps
-- seacobble  -->  cobble in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
-- seacoral  -->  give some health directly and can be used as dyes with the unified dyes mod
-				and optionally the color machine mod
-				Colors: aqua, cyan, lime, magenta, redviolet and skyblue
-- seaglass  -->  seaglass that can be on or off in the colors, neutral, white, yellow, red, blue and black
-- seagravel  -->  gravel in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
-- sealamps  -->  a torch that burns under water and a diving lantern
-- seaplants  -->  provide some health when eating them, combine them to make a seasalad mix
-- seastone  -->  stone in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
-- seastonebrick  -->  stonebrick in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
-- seawrecks  -->  This version two types, consisting of 'default' materials
-- stairsshine  -->  Just like minetest_game's stairs supports stair- and slabmaking for the blocks,
-					this one supports blocks that have a lightsource_14
-- whiteshell  -->  provides some more crushed white shells for blocks
-
------------------------------------------------
-Dependencies   ? = optional
------------------------------------------------
-
-- clams  -->  default
-- noairblocks  -->  default
-- seacobble  -->  default, dye, stairs, clams, whiteshell? , colormachine?
-- seacoral  -->  default, noairblocks, unifieddyes, colormachine?
-- seaglass  -->  default, dye, stairs, clams, stairsshine? , colormachine?
-- seagravel  -->  default, dye, stairs, clams, whiteshell? , colormachine?
-- sealamps  -->  default, bucket, noairblocks
-- seaplants  -->  default, noairblocks
-- seastone  -->  default, dye, stairs, clams, whiteshell? , colormachine?
-- seastonebrick  -->  default, stairs, seastone, colormachine?
-- seawrecks  -->  default
-- stairsshine  -->  default
-- whiteshell  -->  default, clams
-
-
-----------------------------------
-Credits
-----------------------------------
-
-- Celeron55 for making minetest and this mod possible (the mapgen.lua code (and part of his mob mod code) and for the minetest_game stairs mod)
-- Kahrl for the minetest_game stairs mod
-- VanessaE for making unifieddyes (among of a lot of other good mods)
-- Cornernote (for the dye_code in an older sea version). Thanks for all your work for minetest cornernote!
-- Chinchow, for asking me what I was doing (nothing constructive till then)
-- Sapier, because of his fish in his animals-mod I understood you could build something under water without an waterblock around it.
-- Inocudom, for the support of this modpack (and telling me about Jeija's hydro-turbine).
-- Jeija (because of the hydro-turbine (mesecons)).
-- Neuromancer for the constructive feed-back concerning the performance.
-- Sokomine for constructive feedback of the total modpack
-- Mossmanikin for his support
-- Jouster27 for the helpful feedback about version 0.3.0
-- Chlue simple abm profiling ( https://forum.minetest.net/viewtopic.php?pid=113112#p113112 )
-
 Licenses
 --------------
 

mods/sea/README.md

@@ -0,0 +1,59 @@
+-------------------------------------------------------------------------------------------------
+sea-modpack
+-------------------------------------------------------------------------------------------------
+
+Version 0.4.0
+
+- clams  -->  collect algae for seaglass and crushed white shells for blocks
+- noairblocks  -->  removes the airblocks around seacorals, seaplants and sealamps
+- seacobble  -->  cobble in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
+- seacoral  -->  give some health directly and can be used as dyes with the unified dyes mod
+				and optionally the color machine mod
+				Colors: aqua, cyan, lime, magenta, redviolet and skyblue
+- seaglass  -->  seaglass that can be on or off in the colors, neutral, white, yellow, red, blue and black
+- seagravel  -->  gravel in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
+- sealamps  -->  a torch that burns under water and a diving lantern
+- seaplants  -->  provide some health when eating them, combine them to make a seasalad mix
+- seastone  -->  stone in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
+- seastonebrick  -->  stonebrick in the colors white/neutral, aqua, cyan, lime, magenta, redviolet and skyblue
+- seawrecks  -->  This version two types, consisting of 'default' materials
+- stairsshine  -->  Just like minetest_game's stairs supports stair- and slabmaking for the blocks,
+					this one supports blocks that have a lightsource_14
+- whiteshell  -->  provides some more crushed white shells for blocks
+
+-----------------------------------------------
+Dependencies   ? = optional
+-----------------------------------------------
+
+- clams  -->  default
+- noairblocks  -->  default
+- seacobble  -->  default, dye, stairs, clams, whiteshell? , colormachine?
+- seacoral  -->  default, noairblocks, unifieddyes, colormachine?
+- seaglass  -->  default, dye, stairs, clams, stairsshine? , colormachine?
+- seagravel  -->  default, dye, stairs, clams, whiteshell? , colormachine?
+- sealamps  -->  default, bucket, noairblocks
+- seaplants  -->  default, noairblocks
+- seastone  -->  default, dye, stairs, clams, whiteshell? , colormachine?
+- seastonebrick  -->  default, stairs, seastone, colormachine?
+- seawrecks  -->  default
+- stairsshine  -->  default
+- whiteshell  -->  default, clams
+
+
+----------------------------------
+Credits
+----------------------------------
+
+- Celeron55 for making minetest and this mod possible (the mapgen.lua code (and part of his mob mod code) and for the minetest_game stairs mod)
+- Kahrl for the minetest_game stairs mod
+- VanessaE for making unifieddyes (among of a lot of other good mods)
+- Cornernote (for the dye_code in an older sea version). Thanks for all your work for minetest cornernote!
+- Chinchow, for asking me what I was doing (nothing constructive till then)
+- Sapier, because of his fish in his animals-mod I understood you could build something under water without an waterblock around it.
+- Inocudom, for the support of this modpack (and telling me about Jeija's hydro-turbine).
+- Jeija (because of the hydro-turbine (mesecons)).
+- Neuromancer for the constructive feed-back concerning the performance.
+- Sokomine for constructive feedback of the total modpack
+- Mossmanikin for his support
+- Jouster27 for the helpful feedback about version 0.3.0
+- Chlue simple abm profiling ( https://forum.minetest.net/viewtopic.php?pid=113112#p113112 )

mods/sea/clams/init.lua

@@ -35,7 +35,7 @@ minetest.register_node("clams:dirtalgae", {
 			}
 		}
 	},
-	sounds = default.node_sound_dirt_defaults,
+	sounds = default.node_sound_dirt_defaults,	
 })
 
 minetest.register_node("clams:sandalgaeused", {
@@ -80,9 +80,9 @@ minetest.register_entity("clams:whiteshell", {
 	phase = 0,
 	phasetimer = 0,
 
-	on_activate = function(self, staticdata)
+	-- on_activate = function(self, staticdata)
-		minetest.log("whiteshell activated!")
+	-- 	minetest.log("whiteshell activated!")
-	end,
+	-- end,
 
 	on_step = function(self, dtime)
 		self.phasetimer = self.phasetimer + dtime
@@ -160,8 +160,8 @@ minetest.register_ore({
 	clust_scarcity = 9*9*9,
 	clust_num_ores = 16,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -60,
+	y_min     = -60,
 })
 
 minetest.register_ore({
@@ -171,17 +171,17 @@ minetest.register_ore({
 	clust_scarcity = 9*9*9,
 	clust_num_ores = 16,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -60,
+	y_min     = -60,
 })
 
 
-local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max)
-	if maxp.y < height_min or minp.y > height_max then
+	if maxp.y < y_min or minp.y > y_max then
 		return
 	end
-	local y_min = math.max(minp.y, height_min)
+	local y_min = math.max(minp.y, y_min)
-	local y_max = math.min(maxp.y, height_max)
+	local y_max = math.min(maxp.y, y_max)
 	if chunk_size >= y_max - y_min + 1 then
 		return
 	end
@@ -191,7 +191,7 @@ local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume,
 	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
 	for i=1,num_chunks do
 		local y0 = pr:next(y_min, y_max-chunk_size+1)
-		if y0 >= height_min and y0 <= height_max then
+		if y0 >= y_min and y0 <= y_max then
 			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
 			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
 			local p0 = {x=x0, y=y0, z=z0}
@@ -389,4 +389,4 @@ minetest.register_alias("shells_dye:yellowlightglass","clams:yellowlightglass")
 minetest.register_alias("shells_dye:redlightglass","clams:redlightglass")
 minetest.register_alias("shells_dye:bluelightglass","clams:bluelightglass")
 minetest.register_alias("shells_dye:whitelightglass","clams:whitelightglass")
-minetest.register_alias("shells_dye:blacklightglass","clams:blacklightglass")
+minetest.register_alias("shells_dye:blacklightglass","clams:blacklightglass")

mods/sea/noairblocks/init.lua

@@ -229,4 +229,4 @@ local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1}
 	return
 	end
 end,
-})
+})

mods/sea/seacoral/init.lua

@@ -1,5 +1,6 @@
 -- NODES
 
+-- Lightened nodes for MFF
 local sea_light_source = 5
 
 minetest.register_node("seacoral:coralcyan", {
@@ -279,8 +280,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -290,8 +291,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -301,8 +302,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -312,8 +313,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -323,8 +324,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -334,8 +335,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -345,8 +346,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -356,8 +357,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -367,8 +368,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -378,8 +379,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -389,8 +390,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
 minetest.register_ore({
@@ -400,16 +401,16 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -4,
+	y_max     = -4,
-	y_min          = -8,
+	y_min     = -8,
 })
 
-local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max)
-	if maxp.y < height_min or minp.y > height_max then
+	if maxp.y < y_min or minp.y > y_max then
 		return
 	end
-	local y_min = math.max(minp.y, height_min)
+	local y_min = math.max(minp.y, y_min)
-	local y_max = math.min(maxp.y, height_max)
+	local y_max = math.min(maxp.y, y_max)
 	if chunk_size >= y_max - y_min + 1 then
 		return
 	end
@@ -419,7 +420,7 @@ local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume,
 	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
 	for i=1,num_chunks do
 		local y0 = pr:next(y_min, y_max-chunk_size+1)
-		if y0 >= height_min and y0 <= height_max then
+		if y0 >= y_min and y0 <= y_max then
 			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
 			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
 			local p0 = {x=x0, y=y0, z=z0}

mods/sea/seagravel/init.lua

@@ -178,4 +178,4 @@ register_seagravel_craft("seagravel:seagravel_magenta", {'clams:crushedwhite', '
 register_seagravel_craft("seagravel:seagravel_lime", {'clams:crushedwhite', 'default:gravel','dye:lime'})
 register_seagravel_craft("seagravel:seagravel_aqua", {'clams:crushedwhite', 'default:gravel','dye:aqua'})
 register_seagravel_craft("seagravel:seagravel_skyblue", {'clams:crushedwhite', 'default:gravel','dye:skyblue'})
-register_seagravel_craft("seagravel:seagravel_redviolet", {'clams:crushedwhite', 'default:gravel','dye:redviolet'})
+register_seagravel_craft("seagravel:seagravel_redviolet", {'clams:crushedwhite', 'default:gravel','dye:redviolet'})

mods/sea/seaplants/init.lua

@@ -1,5 +1,6 @@
 -- NODES
 
+-- Lightened nodes for MFF
 local sea_light_source = 5
 
 minetest.register_node("seaplants:kelpgreen", {
@@ -244,8 +245,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -255,8 +256,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -266,8 +267,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -277,8 +278,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -288,8 +289,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -299,8 +300,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -310,8 +311,8 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 minetest.register_ore({
@@ -321,16 +322,16 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 24,
 	clust_size     = 4,
-	y_max          = -14,
+	y_max     = -14,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
-local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max)
-	if maxp.y < height_min or minp.y > height_max then
+	if maxp.y < y_min or minp.y > y_max then
 		return
 	end
-	local y_min = math.max(minp.y, height_min)
+	local y_min = math.max(minp.y, y_min)
-	local y_max = math.min(maxp.y, height_max)
+	local y_max = math.min(maxp.y, y_max)
 	if chunk_size >= y_max - y_min + 1 then
 		return
 	end
@@ -340,7 +341,7 @@ local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume,
 	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
 	for i=1,num_chunks do
 		local y0 = pr:next(y_min, y_max-chunk_size+1)
-		if y0 >= height_min and y0 <= height_max then
+		if y0 >= y_min and y0 <= y_max then
 			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
 			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
 			local p0 = {x=x0, y=y0, z=z0}
@@ -412,9 +413,9 @@ action = function(pos, node, active_object_count, active_object_count_wider)
 			minetest.get_node(yyp).name == "noairblocks:water_sourcex") then
 				if (minetest.get_node(yyyp).name == "default:water_source" or
 				minetest.get_node(yyyp).name == "noairblocks:water_sourcex") then
-					minetest.add_node(pos, {name = "seaplants:kelpgreenmiddle"})
+					minetest.add_node(pos, {name = "seaplants:kelpgreenmiddle"}) 
 					pos.y = pos.y + 1
-					minetest.add_node(pos, {name = "seaplants:kelpgreen"})
+					minetest.add_node(pos, {name = "seaplants:kelpgreen"}) 
 				else
 				return
 			end
@@ -468,9 +469,9 @@ action = function(pos, node, active_object_count, active_object_count_wider)
 			minetest.get_node(yyp).name == "noairblocks:water_sourcex") then
 				if (minetest.get_node(yyyp).name == "default:water_source" or
 				minetest.get_node(yyyp).name == "noairblocks:water_sourcex") then
-					minetest.add_node(pos, {name = "seaplants:kelpbrownmiddle"})
+					minetest.add_node(pos, {name = "seaplants:kelpbrownmiddle"}) 
 					pos.y = pos.y + 1
-					minetest.add_node(pos, {name = "seaplants:kelpbrown"})
+					minetest.add_node(pos, {name = "seaplants:kelpbrown"}) 
 				else
 				return
 			end

mods/sea/whiteshell/init.lua

@@ -32,17 +32,17 @@ minetest.register_ore({
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 18,
 	clust_size     = 6,
-	y_max          = 31000,
+	y_max     = 31000,
-	y_min          = -31000,
+	y_min     = -31000,
 })
 
 
-local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max)
-	if maxp.y < height_min or minp.y > height_max then
+	if maxp.y < y_min or minp.y > y_max then
 		return
 	end
-	local y_min = math.max(minp.y, height_min)
+	local y_min = math.max(minp.y, y_min)
-	local y_max = math.min(maxp.y, height_max)
+	local y_max = math.min(maxp.y, y_max)
 	if chunk_size >= y_max - y_min + 1 then
 		return
 	end
@@ -52,7 +52,7 @@ local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume,
 	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
 	for i=1,num_chunks do
 		local y0 = pr:next(y_min, y_max-chunk_size+1)
-		if y0 >= height_min and y0 <= height_max then
+		if y0 >= y_min and y0 <= y_max then
 			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
 			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
 			local p0 = {x=x0, y=y0, z=z0}
@@ -80,3 +80,5 @@ end
 
 
 minetest.register_alias("clams:whiteshell","whiteshell:whiteshell")
+
+minetest.log("action", "[Mod] Sea Loaded.")