Finish the Texture Update

mods/ITEMS/pyutest_blocks/api.lua

@@ -183,3 +183,51 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     }
   })
 end
+
+PyuTest.make_liquid = function(name, desc, groups, texture, speed, extra_conf)
+  local function make_liquid_flags(liquidtype)
+    local drawtype = ""
+
+    if liquidtype == "source" then
+      drawtype = "liquid"
+    elseif liquidtype == "flowing" then
+      drawtype = "flowingliquid"
+    end
+
+    local t = PyuTest.util.tableconcat({
+      drawtype = drawtype,
+      waving = 3,
+      walkable = false,
+      pointable = false,
+      buildable_to = true,
+      is_ground_content = false,
+      use_texture_alpha = "blend",
+      paramtype = "light",
+      drop = "",
+      drowning = 3,
+      liquidtype = liquidtype,
+      liquid_renewable = true,
+      liquid_viscosity = speed or 1,
+      liquid_alternative_flowing = name .. "_flowing",
+      liquid_alternative_source = name .. "_source",
+      paramtype2 = liquidtype == "flowing" and "flowingliquid" or nil,
+      special_tiles = liquidtype == "flowing" and {
+        {
+          name = texture,
+          backface_culling = false
+        },
+        {
+          name = texture,
+          backface_culling = true
+        }
+      } or nil
+    }, extra_conf or {})
+    return t
+  end
+
+  local g = groups or {}
+  g["liquid"] = 1
+
+  PyuTest.make_node(name .. "_source", desc .. " Source", g, { texture }, make_liquid_flags("source"))
+  PyuTest.make_node(name .. "_flowing", "Flowing " .. desc, g, { texture }, make_liquid_flags("flowing"))
+end

mods/ITEMS/pyutest_blocks/basic.lua

@@ -4,14 +4,16 @@ PyuTest.make_building_blocks("pyutest_blocks:dirt", "Dirt", { "pyutest-dirt.png"
   crumbly = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-podzol.png" }, nil, {
+PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-dirt.png" }, nil, {
   ground = 1,
   acid_vulnerable = 1,
   crumbly = PyuTest.BLOCK_FAST
+}, {
+  overlay_tiles = {{name = "pyutest-ore-overlay.png", color = "#54623c"}}
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:snow", "Snow", { "pyutest-snow.png" }, nil, {
-  ground = 1,
+ground = 1,
   acid_vulnerable = 1,
   crumbly = PyuTest.BLOCK_FAST
 })
@@ -25,10 +27,12 @@ PyuTest.make_building_blocks("pyutest_blocks:sand", "Sand", { "pyutest-sand.png"
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:mycelium", "Mycelium", {
-  "pyutest-mycelium.png"
+  {name = "pyutest-grass-top.png", color = "#5c455e"}, "pyutest-dirt.png"
 }, nil, {
   ground = 1,
-  crumbly = PyuTest.BLOCK_FAST
+  crumbly = PyuTest.BLOCK_FAST,
+}, {
+  overlay_tiles = {"", "", {name = "pyutest-grass-side.png", color = "#5c455e"}}
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:clay", "Clay", { "pyutest-clay-block.png" }, nil, {
@@ -110,26 +114,12 @@ PyuTest.make_building_blocks("pyutest_blocks:bone", "Bone", {
   cracky = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:enchanted_obsidian", "Enchanted Obsidian", {
-  "pyutest-enchanted-obsidian.png"
-}, nil, {
-  cracky = PyuTest.BLOCK_SLOW
-}, {
-  is_ground_content = false
-})
-
 PyuTest.make_building_blocks("pyutest_blocks:brick", "Brick", { "pyutest-bricks.png" }, nil, {
   cracky = PyuTest.BLOCK_NORMAL
 }, {
   is_ground_content = false
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:stone_bricks", "Stone Bricks", { "pyutest-stone-bricks.png" }, nil, {
-  cracky = PyuTest.BLOCK_SLOW
-}, {
-  is_ground_content = false
-})
-
 -- Choppy
 PyuTest.make_building_blocks("pyutest_blocks:mushroom", "Mushroom", { "pyutest-mushroom.png" }, nil, {
   flammable = 1,
@@ -166,7 +156,7 @@ PyuTest.make_building_blocks("pyutest_blocks:slime", "Slime", { "pyutest-slime.p
   oddly_breakable_by_hand = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:glowslime", "Glowslime", { "pyutest-glowslime.png" }, nil, {
+PyuTest.make_building_blocks("pyutest_blocks:glowslime", "Glowslime", { "pyutest-slime.png" }, nil, {
   bouncy = 85,
   oddly_breakable_by_hand = PyuTest.BLOCK_FAST
 }, {

mods/ITEMS/pyutest_blocks/liquid.lua

@@ -1,51 +1,3 @@
-PyuTest.make_liquid = function(name, desc, groups, texture, speed, extra_conf)
-  local function make_liquid_flags(liquidtype)
-    local drawtype = ""
-
-    if liquidtype == "source" then
-      drawtype = "liquid"
-    elseif liquidtype == "flowing" then
-      drawtype = "flowingliquid"
-    end
-
-    local t = PyuTest.util.tableconcat({
-      drawtype = drawtype,
-      waving = 3,
-      walkable = false,
-      pointable = false,
-      buildable_to = true,
-      is_ground_content = false,
-      use_texture_alpha = "blend",
-      paramtype = "light",
-      drop = "",
-      drowning = 3,
-      liquidtype = liquidtype,
-      liquid_renewable = true,
-      liquid_viscosity = speed or 1,
-      liquid_alternative_flowing = name .. "_flowing",
-      liquid_alternative_source = name .. "_source",
-      paramtype2 = liquidtype == "flowing" and "flowingliquid" or nil,
-      special_tiles = liquidtype == "flowing" and {
-        {
-          name = texture,
-          backface_culling = false
-        },
-        {
-          name = texture,
-          backface_culling = true
-        }
-      } or nil
-    }, extra_conf or {})
-    return t
-  end
-
-  local g = groups or {}
-  g["liquid"] = 1
-
-  PyuTest.make_node(name .. "_source", desc .. " Source", g, { texture }, make_liquid_flags("source"))
-  PyuTest.make_node(name .. "_flowing", "Flowing " .. desc, g, { texture }, make_liquid_flags("flowing"))
-end
-
 PyuTest.make_liquid("pyutest_blocks:water", "Water", {
   water = 1,
   freezable = 1,

mods/ITEMS/pyutest_blocks/special.lua

@@ -173,10 +173,20 @@ PyuTest.make_node("pyutest_blocks:ladder", "Ladder", {
 
 PyuTest.make_node("pyutest_blocks:magma", "Magma", {
   cracky = PyuTest.BLOCK_FAST
-}, { "pyutest-magma.png" }, {
+}, { "pyutest-molten-rock.png" }, {
   paramtype = "light",
   light_source = 11,
-  damage_per_second = 3
+  damage_per_second = 3,
+  overlay_tiles = {
+    {name = "pyutest-ore-overlay.png", color = "darkorange"}
+  }
+})
+
+PyuTest.make_node("pyutest_blocks:bedrock", "Bedrock", {
+}, {"pyutest-bedrock.png"}, {
+  diggable = false,
+  pointable = "blocking",
+  is_ground_content = false
 })
 
 minetest.register_abm({