mods/amogus_blocks/init.lua

@@ -190,137 +190,66 @@ minetest.register_node("amogus_blocks:wood", {
 	groups = {choppy = 3, flammable = 3, wood = 1},
 })
 
-
+minetest.register_node("amogus_blocks:water", {
--- OLD water. not flowing. throwing massive amounts of errors.
+	description = "Water",
-
---minetest.register_node("amogus_blocks:water", {
---	description = "Water",
---	drawtype = "liquid",
---	tiles = {
---		{
---			name = "water.png",
---			--animation = {
---			--	type = "vertical_frames",
---			--	aspect_w = 16,
---			--	aspect_h = 16,
---			--	length = 2.0,
---			--},
---		},
---		--{
---		--	name = "water.png",
---		--	animation = {
---		--		type = "vertical_frames",
---		--		aspect_w = 16,
---		--		aspect_h = 16,
---		--		length = 2.0,
---		--	},
---		--},
---	},
---	--special_tiles = {
---	--	-- New-style water source material (mostly unused)
---	--	{
---	--		name = "water.png",
---	--		backface_culling = false,
---	--		animation = {
---	--			type = "vertical_frames",
---	--			aspect_w = 16,
---	--			aspect_h = 16,
---	--			length = 2.0,
---	--		},
---	--	},
---	--	-- New-style flowing water material (mostly unused)
---	--	{
---	--		name = "water.png",
---	--		backface_culling = true,
---	--		animation = {
---	--			type = "vertical_frames",
---	--			aspect_w = 16,
---	--			aspect_h = 16,
---	--			length = 0.8,
---	--		},
---	--	},
---	--},
---	alpha = 160,
---	paramtype = "light",
---	walkable = false,
---	pointable = false,
---	diggable = false,
---	--buildable_to = true,
---	drowning = 1,
---	liquidtype = "source",
---	--liquid_alternative_flowing = "amogus_blocks:water_flowing",
---	--liquid_alternative_source = "amogus_blocks:water_source",
---	liquid_viscosity = 1,
---	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
---	groups = {water = 3, liquid = 3, puts_out_fire = 1},
---})
-
-minetest.register_node("amogus_blocks:water_source", {
-	description = "Water Source",
 	drawtype = "liquid",
-	waving = 3,
-
 	tiles = {
 		{
 			name = "water.png",
-			backface_culling = false,
+			--animation = {
+			--	type = "vertical_frames",
+			--	aspect_w = 16,
+			--	aspect_h = 16,
+			--	length = 2.0,
+			--},
 		},
-		{
+		--{
-			name = "water.png",
+		--	name = "water.png",
-			backface_culling = true,
+		--	animation = {
+		--		type = "vertical_frames",
+		--		aspect_w = 16,
+		--		aspect_h = 16,
+		--		length = 2.0,
+		--	},
+		--},
 	},
-	},
+	--special_tiles = {
-
+	--	-- New-style water source material (mostly unused)
-	use_texture_alpha = "blend",
+	--	{
+	--		name = "water.png",
+	--		backface_culling = false,
+	--		animation = {
+	--			type = "vertical_frames",
+	--			aspect_w = 16,
+	--			aspect_h = 16,
+	--			length = 2.0,
+	--		},
+	--	},
+	--	-- New-style flowing water material (mostly unused)
+	--	{
+	--		name = "water.png",
+	--		backface_culling = true,
+	--		animation = {
+	--			type = "vertical_frames",
+	--			aspect_w = 16,
+	--			aspect_h = 16,
+	--			length = 0.8,
+	--		},
+	--	},
+	--},
+	alpha = 160,
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
 	diggable = false,
-	buildable_to = true,
+	--buildable_to = true,
-	is_ground_content = false,
-	drop = "",
 	drowning = 1,
 	liquidtype = "source",
-	liquid_alternative_flowing = "amogus_blocks:water_flowing",
+	--liquid_alternative_flowing = "amogus_blocks:water_flowing",
-	liquid_alternative_source = "amogus_blocks:water_source",
+	--liquid_alternative_source = "amogus_blocks:water_source",
 	liquid_viscosity = 1,
 	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
-	groups = {water = 3, liquid = 3, cools_lava = 1}
+	groups = {water = 3, liquid = 3, puts_out_fire = 1},
-})
-
-minetest.register_node("amogus_blocks:water_flowing", {
-	description = "Flowing Water",
-	drawtype = "flowingliquid",
-	waving = 3,
-
-	tiles = {"water.png"},
-	special_tiles = {
-		{
-			name = "water.png",
-			backface_culling = false,
-		},
-		{
-			name = "water.png",
-			backface_culling = true,
-		},
-	},
-	
-	use_texture_alpha = "blend",
-	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 = "amogus_blocks:water_flowing",
-	liquid_alternative_source = "amogus_blocks:water_source",
-	liquid_viscosity = 1,
-	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
-	groups = {water = 3, liquid = 3, not_in_creative_inventory = 1, cools_lava = 1}
 })
 
 minetest.register_node("amogus_blocks:dirt", {
@@ -489,8 +418,8 @@ minetest.register_node("amogus_blocks:grass_tall", {
 	  fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 	},
 
-})
+  })
-minetest.register_node("amogus_blocks:purple_grass_tall", {
+  minetest.register_node("amogus_blocks:purple_grass_tall", {
 	description = "Grass plant",
 	drawtype = "plantlike",
 	tiles = {"purple_grass_tall.png"},
@@ -505,8 +434,8 @@ minetest.register_node("amogus_blocks:purple_grass_tall", {
 	  type = "fixed",
 	  fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 	},
-})
+  })
-minetest.register_node("amogus_blocks:amogflower", {
+  minetest.register_node("amogus_blocks:amogflower", {
 	description = "amogus flower",
 	drawtype = "plantlike",
 	tiles = {"amog_flower.png"},
@@ -522,8 +451,8 @@ minetest.register_node("amogus_blocks:amogflower", {
 	  type = "fixed",
 	  fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 	},
-})
+  })
-minetest.register_node("amogus_blocks:redflower", {
+  minetest.register_node("amogus_blocks:redflower", {
 	description = "red flower",
 	drawtype = "plantlike",
 	tiles = {"flower.png"},
@@ -538,8 +467,8 @@ minetest.register_node("amogus_blocks:redflower", {
 	  type = "fixed",
 	  fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 	},
-})
+  })
-minetest.register_node("amogus_blocks:yellowflower", {
+  minetest.register_node("amogus_blocks:yellowflower", {
 	description = "yellow flower",
 	drawtype = "plantlike",
 	tiles = {"flower_2.png"},
@@ -554,7 +483,7 @@ minetest.register_node("amogus_blocks:yellowflower", {
 	  type = "fixed",
 	  fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 	},
-})
+  })
 
   
 minetest.register_node("amogus_blocks:obsusian", {

mods/amogus_entities/entities/amogus_entity.lua

@@ -120,7 +120,7 @@ local entity = {
         pos.z = pos.z + dir_sin
         
         local bnode = minetest.get_node(pos)
-        if bnode.name == "air" or bnode.name == "amogus_blocks:water_source" or bnode.name == "amogus_blocks:water_flowing" then
+        if bnode.name == "air" or bnode.name == "amogus_blocks:water" then
             self.block_lastly_in_front = false
         else
             if self.block_lastly_in_front == false then

mods/amogus_entities/entities/mini_crewmate_entity.lua

@@ -281,7 +281,7 @@ local entity = {
         pos.z = pos.z + dir_sin
         
         local bnode = minetest.get_node(pos)
-        if bnode.name == "air" or bnode.name == "amogus_blocks:water_source" or bnode.name == "amogus_blocks:water_flowing" then
+        if bnode.name == "air" or bnode.name == "amogus_blocks:water" then
             self.block_lastly_in_front = false
         else
             if self.block_lastly_in_front == false then

mods/amogus_generator/init.lua

@@ -1,8 +1,7 @@
 
 minetest.register_alias("mapgen_stone", "amogus_blocks:stone")
 minetest.register_alias("mapgen_dirt", "amogus_blocks:dirt")
-minetest.register_alias("mapgen_water_source", "amogus_blocks:water_source")
+minetest.register_alias("mapgen_water_source", "amogus_blocks:water")
-
 minetest.register_biome({
     name = "amogus_beach",
     node_top = "amogus_blocks:sand",
@@ -10,12 +9,10 @@ minetest.register_biome({
     node_filler = "amogus_blocks:sand",
     depth_filler = 3,
     node_stone = "amogus_blocks:stone",
-
+    node_water_top = "amogus_blocks:water",
-    --node_water_top = "amogus_blocks:water",
+    depth_water_top = 1,
-    --depth_water_top = 1,
+    node_water = "amogus_blocks:water",
-    node_water = "amogus_blocks:amogus_blocks:water_source",
+    node_river_water = "amogus_blocks:water",
-    --node_river_water = "amogus_blocks:water",
-
     y_max = 6,
     y_min = -5,
     heat_point = 50,
@@ -29,12 +26,10 @@ minetest.register_biome({
     node_filler = "amogus_blocks:dirt",
     depth_filler = 1,
     node_stone = "amogus_blocks:stone",
-
+    node_water_top = "amogus_blocks:water",
-    --node_water_top = "amogus_blocks:water",
+    depth_water_top = 1,
-    --depth_water_top = 1,
+    node_water = "amogus_blocks:water",
-    node_water = "amogus_blocks:amogus_blocks:water_source",
+    node_river_water = "amogus_blocks:water",
-    --node_river_water = "amogus_blocks:water",
-
     y_max = 31000,
     y_min = 1,
     heat_point = 100,
@@ -48,12 +43,10 @@ minetest.register_biome({
     node_filler = "amogus_blocks:dirt",
     depth_filler = 1,
     node_stone = "amogus_blocks:stone",
-
+    node_water_top = "amogus_blocks:water",
-    --node_water_top = "amogus_blocks:water",
+    depth_water_top = 1,
-    --depth_water_top = 1,
+    node_water = "amogus_blocks:water",
-    node_water = "amogus_blocks:amogus_blocks:water_source",
+    node_river_water = "amogus_blocks:water",
-    --node_river_water = "amogus_blocks:water",
-
     y_max = 31000,
     y_min = 1,
     heat_point = 50,
@@ -521,15 +514,16 @@ minetest.register_decoration({
     schematic = "/schematics/STATUE_GIANT.mts",
 })
 
---minetest.register_on_generated(function(minp, maxp, seed)
+minetest.register_on_generated(function(minp, maxp, seed)
---    for x = minp.x, maxp.x do
+    for x = minp.x, maxp.x do
---       for y = minp.y, maxp.y do
+       for y = minp.y, maxp.y do
---          for z = minp.z, maxp.z do
+          for z = minp.z, maxp.z do
---             local p = {x=x, y=y, z=z}
+             local p = {x=x, y=y, z=z}
---             if minetest.get_node(p).name == "default:water_source" then
+             if minetest.get_node(p).name == "default:water_source" then
---                minetest.set_node(p, {name="default:water_source", param2=0})
+                minetest.set_node(p, {name="default:water_source", param2=0})
---             end
+             end
---          end
+          end
---       end
+       end
---    end
+    end
--- end)
+ end)
+