tried to fix detection of latest version of technic mod.

limited the number of recipes affected by it - now only the tubes' recipes
are disabled when technic is present.  All pipes, pipe devices, and tube
devices are available at all times.

updated the plastic sheet crafting chain to match current homedecor

diff --git a/crafts.lua b/crafts.lua
index e5adc4ebaa6a5cd32c484e6f83180133c63dee71..8971a67d480fb0f5532edfd7f29897298fc7e831 100644 (file)
--- a/crafts.lua
+++ b/crafts.lua
@@ -1,86 +1,158 @@
--- Crafting recipes for pipeworks
+-- Crafting recipes for pipes
 
--- If the technic mod is present, then don't bother registering these recipes
--- as that mod supplies its own.
+minetest.register_craft( {
+        output = "pipeworks:pipe_110000_empty 12",
+        recipe = {
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+                { "", "", "" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
 
-if io.open(minetest.get_modpath("pipeworks").."/../technic/init.lua", "r") == nil then
+minetest.register_craft( {
+        output = "pipeworks:spigot 3",
+        recipe = {
+                { "pipeworks:pipe_110000_empty", "" },
+                { "", "pipeworks:pipe_110000_empty" },
+        },
+})
 
-       -- If homedecor is not installed, we need to register a few of its crafts
-       -- manually so we can use them.
+minetest.register_craft( {
+       output = "pipeworks:entry_panel 2",
+       recipe = {
+               { "", "default:steel_ingot", "" },
+               { "", "pipeworks:pipe_110000_empty", "" },
+               { "", "default:steel_ingot", "" },
+       },
+})
 
-       if minetest.get_modpath("homedecor") == nil then
+-- Various ancillary pipe devices
 
-               minetest.register_craftitem(":homedecor:plastic_sheeting", {
-                       description = "Plastic sheet",
-                       inventory_image = "pipeworks_plastic_sheeting.png",
-               })
+minetest.register_craft( {
+        output = "pipeworks:pump_off 2",
+        recipe = {
+                { "default:stone", "default:steel_ingot", "default:stone" },
+                { "moreores:copper_ingot", "default:mese_crystal_fragment", "moreores:copper_ingot" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
 
-               minetest.register_craft({
-                       type = "cooking",
-                       output = "homedecor:plastic_sheeting",
-                       recipe = "default:junglegrass",
-               })
+minetest.register_craft( {
+        output = "pipeworks:valve_off 2",
+        recipe = {
+                { "", "default:stick", "" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+                { "", "default:steel_ingot", "" }
+        },
+})
 
-               minetest.register_craft({
-                       type = 'fuel',
-                       recipe = 'homedecor:plastic_sheeting',
-                       burntime = 30,
-               })
-       end
+minetest.register_craft( {
+        output = "pipeworks:storage_tank_0 2",
+        recipe = {
+                { "", "default:steel_ingot", "default:steel_ingot" },
+                { "default:steel_ingot", "default:glass", "default:steel_ingot" },
+                { "default:steel_ingot", "default:steel_ingot", "" }
+        },
+})
 
-       minetest.register_craft( {
-               output = "pipeworks:pipe_110000_empty 12",
-               recipe = {
-                       { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
-                       { "", "", "" },
-                       { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
-               },
+minetest.register_craft( {
+        output = "pipeworks:grating 2",
+        recipe = {
+                { "default:steel_ingot", "", "default:steel_ingot" },
+                { "", "default:steel_ingot", "" },
+                { "default:steel_ingot", "", "default:steel_ingot" }
+        },
+})
+
+
+-- Various ancillary tube devices
+
+minetest.register_craft( {
+       output = "pipeworks:filter 2",
+       recipe = {
+               { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" },
+               { "default:stick", "default:mese_crystal", "homedecor:plastic_sheeting" },
+               { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }
+       },
+})
+
+
+-- The tubes themselves
+
+
+-- If homedecor is not installed, we need to register its crafting chain for
+-- plastic sheeting so that pipeworks remains compatible with it.
+
+if minetest.get_modpath("homedecor") == nil then
+
+       minetest.register_craftitem(":homedecor:plastic_sheeting", {
+               description = "Plastic sheet",
+               inventory_image = "homedecor_plastic_sheeting.png",
        })
 
-       minetest.register_craft( {
-               output = "pipeworks:pump_off 2",
-               recipe = {
-                       { "default:stone", "default:steel_ingot", "default:stone" },
-                       { "moreores:copper_ingot", "default:mese_crystal_fragment", "moreores:copper_ingot" },
-                       { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
-               },
+       minetest.register_craftitem(":homedecor:plastic_base", {
+               description = "Unprocessed Plastic base",
+               wield_image = "homedecor_plastic_base.png",
+               inventory_image = "homedecor_plastic_base_inv.png",
        })
 
-       minetest.register_craft( {
-               output = "pipeworks:valve_off 2",
-               recipe = {
-                       { "", "default:stick", "" },
-                       { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
-                       { "", "default:steel_ingot", "" }
-               },
+       minetest.register_craft({
+               type = "shapeless",
+               output = 'homedecor:plastic_base 6',
+               recipe = { "default:junglegrass",
+                          "default:junglegrass",
+                          "default:junglegrass"
+               }
        })
 
-       minetest.register_craft( {
-               output = "pipeworks:storage_tank_0 2",
-               recipe = {
-                       { "", "default:steel_ingot", "default:steel_ingot" },
-                       { "default:steel_ingot", "default:glass", "default:steel_ingot" },
-                       { "default:steel_ingot", "default:steel_ingot", "" }
-               },
+       minetest.register_craft({
+               type = "shapeless",
+               output = 'homedecor:plastic_base 3',
+               recipe = { "default:dry_shrub",
+                          "default:dry_shrub",
+                          "default:dry_shrub"
+               },
        })
 
-       minetest.register_craft( {
-               output = "pipeworks:grating 2",
-               recipe = {
-                       { "default:steel_ingot", "", "default:steel_ingot" },
-                       { "", "default:steel_ingot", "" },
-                       { "default:steel_ingot", "", "default:steel_ingot" }
-               },
+       minetest.register_craft({
+               type = "shapeless",
+               output = 'homedecor:plastic_base 4',
+               recipe = { "default:leaves",
+                          "default:leaves",
+                          "default:leaves",
+                          "default:leaves",
+                          "default:leaves",
+                          "default:leaves"
+               }
        })
 
-       minetest.register_craft( {
-               output = "pipeworks:spigot 3",
-               recipe = {
-                       { "pipeworks:pipe_110000_empty", "" },
-                       { "", "pipeworks:pipe_110000_empty" },
-               },
+       minetest.register_craft({
+               type = "cooking",
+               output = "homedecor:plastic_sheeting",
+               recipe = "homedecor:plastic_base",
+       })
+
+       minetest.register_craft({
+               type = 'fuel',
+               recipe = 'homedecor:plastic_base',
+               burntime = 30,
        })
 
+       minetest.register_craft({
+               type = 'fuel',
+               recipe = 'homedecor:plastic_sheeting',
+               burntime = 30,
+       })
+
+end
+
+
+-- If the technic mod is present, then don't bother registering the recipes
+-- for the various tubes, as technic has its own recipes for those.
+
+if io.open(minetest.get_modpath("pipeworks").."/../technic/init.lua", "r") == nil and
+   io.open(minetest.get_modpath("pipeworks").."/../technic_master/technic/init.lua", "r") == nil then
+
        minetest.register_craft( {
                output = "pipeworks:tube 12",
                recipe = {
@@ -146,23 +218,6 @@ if io.open(minetest.get_modpath("pipeworks").."/../technic/init.lua", "r") == ni
                        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
                },
        })
+end
 
-       minetest.register_craft( {
-               output = "pipeworks:filter 2",
-               recipe = {
-                       { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" },
-                       { "default:stick", "default:mese_crystal", "homedecor:plastic_sheeting" },
-                       { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }
-               },
-       })
 
-       minetest.register_craft( {
-        output = "pipeworks:entry_panel 2",
-        recipe = {
-               { "", "default:steel_ingot", "" },
-                { "", "pipeworks:pipe_110000_empty", "" },
-               { "", "default:steel_ingot", "" },
-        },
-       })
-
-end

diff --git a/textures/homedecor_plastic_base.png b/textures/homedecor_plastic_base.png
new file mode 100644 (file)
index 0000000..4d0e3f2
Binary files /dev/null and b/textures/homedecor_plastic_base.png differ

diff --git a/textures/homedecor_plastic_base_inv.png b/textures/homedecor_plastic_base_inv.png
new file mode 100644 (file)
index 0000000..3a02005
Binary files /dev/null and b/textures/homedecor_plastic_base_inv.png differ

diff --git a/textures/homedecor_plastic_sheeting.png b/textures/homedecor_plastic_sheeting.png
new file mode 100644 (file)
index 0000000..810ea2a
Binary files /dev/null and b/textures/homedecor_plastic_sheeting.png differ