another batch of miscelanious fixes

-remove useless on_construct callbacks for active furnace nodes
-stop pots from beeing heated by other pots
-fix furnace turning towards the east when lit
-add textures for pot
-make sure the node list at the top of the file is up to date
-make bed selection box fit to appearance
-bring wallpaper groups in line with plank groups
-change bucket tooltip to refer to liquids instead of water
-stop game from trying to set secure settings, resulting in error messages
-fix spoison wield_image
-override factory storage tanks to stop them from looking for textures from default

minetest.conf

@@ -12,7 +12,4 @@ viewing_range_nodes_max = 100
 max_users = 32
 server_name = WLS Develompent Server
 server_description = Game development for WasteLands: Survival
-secure.http_mod = lp_api
-secure.enable_security = true
-secure.trusted_mods = lp_api
 lp_api.router.cmd = true

mods/beds/beds.lua

@@ -39,7 +39,7 @@ beds.register_bed("beds:fancy_bed", {
 		 {-0.5, -0.375, -0.5, 0.5, 0, 0.5},
 		}
 	},
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.0, 1.5},
 	recipe = {
 		{"wool:white", "wool:white", "wool:white"},
 		{"group:wood", "group:wood", "group:wood"}
@@ -80,7 +80,7 @@ beds.register_bed("beds:straw_bed", {
 		 {-0.5, -0.375, -0.5, 0.5, 0, 0.5},
 		}
 	},
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.0, 1.5},
 	recipe = {
 		{"", "", ""},
 		{"ws_core:straw", "ws_core:straw", "ws_core:straw"}

mods/bucket/content.lua

@@ -1,5 +1,5 @@
 minetest.register_craftitem("bucket:bucket_clay_unfired", {
-	description = minetest.colorize("#FFFFFF", "Unfired Clay Bucket\n")..minetest.colorize("#ababab", "An unfired clay bucket which, when cooked, will hold water."),
+	description = minetest.colorize("#FFFFFF", "Unfired Clay Bucket\n")..minetest.colorize("#ababab", "An unfired clay bucket which, when cooked, will hold liquids."),
 	inventory_image = "bucket_clay_unfired.png",
 	groups = {coal = 1, flammable = 1}
 })
@@ -25,7 +25,7 @@ end
 bucket.register_bucket(
 	{ -- empty bucket
 		item_name = "bucket:bucket_clay_empty",
-		description = minetest.colorize("#FFFFFF", "Empty Clay Bucket\n")..minetest.colorize("#ababab", "Use empty bucket to collect toxic water."),
+		description = minetest.colorize("#FFFFFF", "Empty Clay Bucket\n")..minetest.colorize("#ababab", "Use empty bucket to collect liquids."),
 		inventory_image = "bucket_clay_empty.png",
 		groups = {bucket = 1},
 	},
@@ -61,7 +61,7 @@ bucket.register_bucket(
 bucket.register_bucket(
 	{
 		item_name = "bucket:bucket_empty",
-		description = minetest.colorize("#FFFFFF", "Empty Metal Bucket\n")..minetest.colorize("#ababab", "Use empty bucket to collect toxic water."),
+		description = minetest.colorize("#FFFFFF", "Empty Metal Bucket\n")..minetest.colorize("#ababab", "Use empty bucket to collect liquids."),
 		inventory_image = "bucket_metal_empty.png",
 		groups = {bucket = 1},
 	},

mods/ruins/nodes.lua

@@ -14,6 +14,13 @@
 "ruins:copper_pipe"
 "ruins:copper_pipe_rusty"
 
+"ruins:wallpaper_1"
+"ruins:wallpaper_2"
+"ruins:wallpaper_3"
+"ruins:wallpaper_1_rip"
+"ruins:wallpaper_2_rip"
+"ruins:wallpaper_3_rip"
+
 "ruins:old_skeleton"
 "ruins:old_skeleton2"
 "ruins:human_skull"
@@ -181,7 +188,7 @@ minetest.register_node("ruins:wallpaper_1", {
 		"ruins_wallpaper_1.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 minetest.register_node("ruins:wallpaper_2", {
@@ -196,7 +203,7 @@ minetest.register_node("ruins:wallpaper_2", {
 		"ruins_wallpaper_2.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 minetest.register_node("ruins:wallpaper_3", {
@@ -211,7 +218,7 @@ minetest.register_node("ruins:wallpaper_3", {
 		"ruins_wallpaper_3.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 minetest.register_node("ruins:wallpaper_1_rip", {
@@ -226,7 +233,7 @@ minetest.register_node("ruins:wallpaper_1_rip", {
 		"ws_planks_old.png^ruins_wallpaper_1_rip.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 minetest.register_node("ruins:wallpaper_2_rip", {
@@ -241,7 +248,7 @@ minetest.register_node("ruins:wallpaper_2_rip", {
 		"ws_planks_old.png^ruins_wallpaper_2_rip.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 minetest.register_node("ruins:wallpaper_3_rip", {
@@ -256,7 +263,7 @@ minetest.register_node("ruins:wallpaper_3_rip", {
 		"ws_planks_old.png^ruins_wallpaper_3_rip.png"
 	},
 	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+	groups = {choppy = 3, planks = 1, wood = 1, flammable = 2},
 })
 
 --------------------Made by TobyPlowy-----------------------

mods/ws_core/furnace.lua

@@ -49,7 +49,7 @@ minetest.register_node("ws_core:furnace_top", {
         aspect_h = 16,
         length = 2.0,
       },
-    }, "ws_barrel_top.png", "ws_barrel.png"},
+  }, "ws_pot_bottom.png", "ws_pot.png"},
   groups = {oddly_breakable_by_hand = 2},
   is_ground_content = false,
   on_construct = function(pos)
@@ -104,18 +104,10 @@ minetest.register_node("ws_core:furnace_top_active", {
         aspect_h = 16,
         length = 2.0,
       },
-    }, "ws_barrel_top.png", "ws_barrel.png"},
+  }, "ws_pot_bottom.png", "ws_pot.png"},
   drop = "ws_core:furnace_top",
-  groups = {oddly_breakable_by_hand = 2, not_in_creative_inventory=1, hot=1},
+  groups = {oddly_breakable_by_hand = 2, not_in_creative_inventory=1},
   is_ground_content = false,
-  on_construct = function(pos)
-    local meta = minetest.get_meta(pos)
-    meta:set_string("formspec", furnace_top_formspec())
-    meta:set_string("infotext", "pot")
-    local inv = meta:get_inventory()
-    inv:set_size("src", 1)
-    inv:set_size("dst", 4)
-  end,
   can_dig = function(pos)
     local meta = minetest.get_meta(pos);
     local inv = meta:get_inventory()
@@ -223,9 +215,11 @@ minetest.register_node("ws_core:furnace_bottom", {
   description = "furnace bottom",
   tiles = {
     "ws_cobble.png^ws_hole.png",
+	"ws_cobble.png",
     "ws_cobble.png",
-    "ws_cobble.png^ws_furnace_front.png",
-    "ws_cobble.png",
+	"ws_cobble.png",
+	"ws_cobble.png",
+	"ws_cobble.png^ws_furnace_front.png",
   },
   paramtype2 = "facedir",
   groups = {cracky=2},
@@ -285,6 +279,9 @@ minetest.register_node("ws_core:furnace_bottom_active", {
       },
     },
     "ws_cobble.png",
+	"ws_cobble.png",
+	"ws_cobble.png",
+	"ws_cobble.png",
     {
       name = "ws_furnace_burning.png",
       backface_culling = false,
@@ -295,20 +292,12 @@ minetest.register_node("ws_core:furnace_bottom_active", {
         length = 4.0,
       },
     },
-    "ws_cobble.png",
   },
-  param2 = "facedir",
+  paramtype2 = "facedir",
   light_source = 14,
   groups = {cracky=2, not_in_creative_inventory=1, hot=1},
   drop = "ws_core:furnace_bottom",
   is_ground_content = false,
-  on_construct = function(pos)
-    local meta = minetest.get_meta(pos)
-    meta:set_string("formspec", furnace_bottom_formspec())
-    meta:set_string("infotext", "furnace bottom");
-    local inv = meta:get_inventory()
-    inv:set_size("fuel", 1)
-  end,
   can_dig = function(pos)
     local meta = minetest.get_meta(pos);
     local inv = meta:get_inventory()
@@ -375,7 +364,7 @@ minetest.register_abm({
     local fuel = nil
     local afterfuel
     local fuellist = inv:get_list("fuel")
-    
+
     if fuellist then
       fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
     end

mods/ws_core/init.lua

@@ -56,3 +56,4 @@ dofile(ws_core_path.."/furnace.lua")
 dofile(ws_core_path.."/filter.lua")
 dofile(ws_core_path.."/torch.lua")
 dofile(ws_core_path.."/lantern.lua")
+dofile(ws_core_path.."/overrides.lua")

mods/ws_core/mod.conf

@@ -1,4 +1,4 @@
 name = ws_core
 description = The basics of the Wastelands: Survival game
 depends = nei, food, stairs
-optional_depends = player_api
+optional_depends = player_api, factory

mods/ws_core/nodes.lua

@@ -2,11 +2,15 @@
 
 -Dirts
 
+"ws_core:grass_block"
+"ws_core:dirt"
 "ws_core:dirt_dry"
 "ws_core:dirt_coarse"
 "ws_core:dirt_rocky"
 "ws_core:dirt_dry_forest"
 "ws_core:clay"
+"ws_core:clay_blue"
+"ws_core:clay_red"
 "ws_core:clay_dirt"
 "ws_core:sandy_dirt"
 "ws_core:gravel"
@@ -15,11 +19,16 @@
 
 "ws_core:stone"
 "ws_core:cobble"
+"ws_core:mossycobble"
 "ws_core:stone_block"
 "ws_core:stonebrick"
+"ws_core:stonebrick_cracked"
 "ws_core:basalt"
 "ws_core:basalt_cobble"
 "ws_core:slate"
+"ws_core:slate_cobble"
+"ws_core:slate_polished"
+"ws_core:slate_bricks"
 "ws_core:andesite"
 "ws_core:andesite_polished"
 "ws_core:granite"
@@ -38,6 +47,7 @@
 
 "ws_core:stone_with_coal"
 "ws_core:stone_with_coal_dense"
+"ws_core:coal_block"
 "ws_core:stone_with_gold"
 "ws_core:stone_with_gold_dense"
 "ws_core:stone_with_iron"
@@ -73,6 +83,10 @@
 "ws_core:dry_papyrus"
 "ws_core:sand_with_cattails"
 "ws_core:cattail_top"
+"ws_core:sand_with_spoison"
+
+"ws_core:brain_skeleton"
+"ws_core:skeleton_brain"
 
 -Liquids
 
@@ -87,10 +101,25 @@
 
 -- non-natural
 "ws_core:bookshelf"
+"ws_core:carpet1"
+"ws_core:glass"
+"ws_core:shingle_brown"
+"ws_core:shingle_brown_slope"
+"ws_core:shingle_brown_slope2"
+"ws_core:shingle_brown_slope3"
+"ws_core:shingle_gray_slope"
+"ws_core:shingle_gray_slope2"
+"ws_core:shingle_gray_slope3"
 
 -Misc
 
 "ws_core:bone"
+"ws_core:straw"
+
+"ws_core:plaster"
+"ws_core:plaster_square"
+"ws_core:plaster_straight"
+"ws_core:plaster_cross"
 
 --]]
 
@@ -842,6 +871,7 @@ minetest.register_node("ws_core:sand_with_spoison", {
 	tiles = {"ws_sandy_dirt.png"},
 	special_tiles = {{name = "ws_spoison_splant.png", tileable_vertical = true}},
 	inventory_image = "ws_spoison_splant.png",
+	wield_image = "ws_spoison_splant.png",
 	paramtype = "light",
 	paramtype2 = "leveled",
 	groups = {snappy = 3},

mods/ws_core/overrides.lua

@@ -0,0 +1,4 @@
+if minetest.get_modpath("factory") then
+	minetest.registered_nodes["factory:storage_tank_water"].special_tiles[1].name = "ws_water_source_animated.png"
+	minetest.registered_nodes["factory:storage_tank_lava"].special_tiles[1].name = "ws_lava_source_animated.png"
+end