update technic

6 files changed, 96 insertions, 86 deletions

diff --git a/extranodes/init.lua b/extranodes/init.lua
index 7dda22f..4871a0b 100644
--- a/extranodes/init.lua
+++ b/extranodes/init.lua
@@ -102,77 +102,85 @@ if minetest.get_modpath("moreblocks") then
 
 end
 
-if minetest.get_modpath("unifieddyes") then
-
-	minetest.register_node(":technic:insulator_clip", {
-		description = "Insulator/cable clip",
-		drawtype = "mesh",
-		mesh = "technic_insulator_clip.obj",
-		tiles = {"technic_insulator_clip.png"},
-		is_ground_content = false,
-		groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1},
-		sounds = default.node_sound_stone_defaults(),
-		paramtype2 = "colorwallmounted",
-		palette = "unifieddyes_palette_colorwallmounted.png",
-		after_place_node = unifieddyes.fix_rotation,
-		after_dig_node = unifieddyes.after_dig_node,
-	})
-
-	minetest.register_node(":technic:insulator_clip_fencepost", {
-		description = "Insulator/cable clip",
-		tiles = {"technic_insulator_clip.png"},
-		is_ground_content = false,
-		paramtype = "light",
-		paramtype2 = "color",
-		palette = "unifieddyes_palette_extended.png",
-		on_construct = unifieddyes.on_construct,
-		after_dig_node = unifieddyes.after_dig_node,
-		drawtype = "nodebox",
-		node_box = {
-			type = "connected",
-			fixed = {
-				{ -0.25,   0.75,   -0.25,   0.25,   1.25,   0.25   }, -- the clip on top
-				{ -0.125, 0.6875, -0.125, 0.125, 0.75,   0.125 },
-				{ -0.1875,  0.625,  -0.1875,  0.1875,  0.6875, 0.1875  },
-				{ -0.125, 0.5625, -0.125, 0.125, 0.625,  0.125 },
-				{ -0.1875,  0.5,    -0.1875,  0.1875,  0.5625, 0.1875  },
-				{ -0.125, 0.4375, -0.125, 0.125, 0.5,    0.125 },
-				{ -0.1875,  0.375,  -0.1875,  0.1875,  0.4375, 0.1875  },
-				{ -0.125, -0.5,    -0.125,  0.125,  0.375,  0.125  }, -- the post, slightly short
-			},
-			-- connect_top =
-			-- connect_bottom =
-			connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8},
-				{-1/16,-5/16,-1/2,1/16,-3/16,-1/8}},
-			connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16},
-				{-1/2,-5/16,-1/16,-1/8,-3/16,1/16}},
-			connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2},
-				{-1/16,-5/16,1/8,1/16,-3/16,1/2}},
-			connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16},
-				{1/8,-5/16,-1/16,1/2,-3/16,1/16}},
+local iclip_def = {
+	description = "Insulator/cable clip",
+	drawtype = "mesh",
+	mesh = "technic_insulator_clip.obj",
+	tiles = {"technic_insulator_clip.png"},
+	is_ground_content = false,
+	groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1 },
+	sounds = default.node_sound_stone_defaults(),
+}
+
+local iclipfence_def = {
+	description = "Insulator/cable clip",
+	tiles = {"technic_insulator_clip.png"},
+	is_ground_content = false,
+	paramtype = "light",
+	drawtype = "nodebox",
+	node_box = {
+		type = "connected",
+		fixed = {
+			{ -0.25,   0.75,   -0.25,   0.25,   1.25,   0.25   }, -- the clip on top
+			{ -0.125, 0.6875, -0.125, 0.125, 0.75,   0.125 },
+			{ -0.1875,  0.625,  -0.1875,  0.1875,  0.6875, 0.1875  },
+			{ -0.125, 0.5625, -0.125, 0.125, 0.625,  0.125 },
+			{ -0.1875,  0.5,    -0.1875,  0.1875,  0.5625, 0.1875  },
+			{ -0.125, 0.4375, -0.125, 0.125, 0.5,    0.125 },
+			{ -0.1875,  0.375,  -0.1875,  0.1875,  0.4375, 0.1875  },
+			{ -0.125, -0.5,    -0.125,  0.125,  0.375,  0.125  }, -- the post, slightly short
 		},
-		connects_to = {"group:fence", "group:wood", "group:tree"},
-		groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1},
-		sounds = default.node_sound_stone_defaults(),
-		place_param2 = 171 -- medium amber, low saturation, closest color to default:wood
-	})
-
-	minetest.register_craft({
-		output = "technic:insulator_clip",
-		recipe = {
-			{ "", "dye:white", ""},
-			{ "", "technic:raw_latex", ""},
-			{ "technic:raw_latex", "default:stone", "technic:raw_latex"},
-		}
-	})
-
-	minetest.register_craft({
-		output = "technic:insulator_clip_fencepost 2",
-		recipe = {
-			{ "", "dye:white", ""},
-			{ "", "technic:raw_latex", ""},
-			{ "technic:raw_latex", "default:fence_wood", "technic:raw_latex"},
-		}
-	})
-
+		-- connect_top =
+		-- connect_bottom =
+		connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8},
+			{-1/16,-5/16,-1/2,1/16,-3/16,-1/8}},
+		connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16},
+			{-1/2,-5/16,-1/16,-1/8,-3/16,1/16}},
+		connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2},
+			{-1/16,-5/16,1/8,1/16,-3/16,1/2}},
+		connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16},
+			{1/8,-5/16,-1/16,1/2,-3/16,1/16}},
+	},
+	connects_to = {"group:fence", "group:wood", "group:tree"},
+	groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1 },
+	sounds = default.node_sound_stone_defaults(),
+}
+
+if not minetest.get_modpath("unifieddyes") then
+	minetest.register_node(":technic:insulator_clip", iclip_def)
+	minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
+else
+	iclip_def.paramtype2 = "colorwallmounted"
+	iclip_def.palette = "unifieddyes_palette_colorwallmounted.png"
+	iclip_def.after_place_node = unifieddyes.fix_rotation
+	iclip_def.after_dig_node = unifieddyes.after_dig_node
+	iclip_def.groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1}
+
+	iclipfence_def.paramtype2 = "color"
+	iclipfence_def.palette = "unifieddyes_palette_extended.png"
+	iclipfence_def.on_construct = unifieddyes.on_construct
+	iclipfence_def.after_dig_node = unifieddyes.after_dig_node
+	iclipfence_def.groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1}
+	iclipfence_def.place_param2 = 171 -- medium amber, low saturation, closest color to default:wood
+
+	minetest.register_node(":technic:insulator_clip", iclip_def)
+	minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
 end
+
+minetest.register_craft({
+	output = "technic:insulator_clip",
+	recipe = {
+		{ "", "dye:white", ""},
+		{ "", "technic:raw_latex", ""},
+		{ "technic:raw_latex", "default:stone", "technic:raw_latex"},
+	}
+})
+
+minetest.register_craft({
+	output = "technic:insulator_clip_fencepost 2",
+	recipe = {
+		{ "", "dye:white", ""},
+		{ "", "technic:raw_latex", ""},
+		{ "technic:raw_latex", "default:fence_wood", "technic:raw_latex"},
+	}
+})
diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua
index b4db47c..4684ba0 100644
--- a/technic/machines/register/centrifuge_recipes.lua
+++ b/technic/machines/register/centrifuge_recipes.lua
@@ -14,6 +14,7 @@ local recipes = {
 	{ "technic:bronze_dust 4",             "technic:copper_dust 3",       "technic:tin_dust"      },
 	{ "technic:stainless_steel_dust 4",    "technic:wrought_iron_dust 3", "technic:chromium_dust" },
 	{ "technic:brass_dust 3",              "technic:copper_dust 2",       "technic:zinc_dust"     },
+	{ "technic:chernobylite_dust",         "default:sand",                "technic:uranium3_dust" },
 	{ "default:dirt 4",                    "default:sand",                "default:gravel",       "default:clay_lump 2"     },
 }
 
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 7eaa7d4..7ba1e0f 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -10,18 +10,18 @@ end
 
 local recipes = {
 	-- Dusts
-	{"default:coal_lump",       "technic:coal_dust 2"},
-	{"default:copper_lump",     "technic:copper_dust 2"},
-	{"default:desert_stone",    "default:desert_sand"},
-	{"default:gold_lump",       "technic:gold_dust 2"},
-	{"default:iron_lump",       "technic:wrought_iron_dust 2"},
-	{"technic:chromium_lump",   "technic:chromium_dust 2"},
-	{"technic:uranium_lump",    "technic:uranium_dust 2"},
-	{"technic:zinc_lump",       "technic:zinc_dust 2"},
-	{"technic:lead_lump",       "technic:lead_dust 2"},
-	{"technic:sulfur_lump",     "technic:sulfur_dust 2"},
-	{"default:stone",           "technic:stone_dust"},
-	{"default:sand",            "technic:stone_dust"},
+	{"default:coal_lump",          "technic:coal_dust 2"},
+	{"default:copper_lump",        "technic:copper_dust 2"},
+	{"default:desert_stone",       "default:desert_sand"},
+	{"default:gold_lump",          "technic:gold_dust 2"},
+	{"default:iron_lump",          "technic:wrought_iron_dust 2"},
+	{"technic:chromium_lump",      "technic:chromium_dust 2"},
+	{"technic:uranium_lump",       "technic:uranium_dust 2"},
+	{"technic:zinc_lump",          "technic:zinc_dust 2"},
+	{"technic:lead_lump",          "technic:lead_dust 2"},
+	{"technic:sulfur_lump",        "technic:sulfur_dust 2"},
+	{"default:stone",              "technic:stone_dust"},
+	{"default:sand",               "technic:stone_dust"},
 	
 	-- Other
 	{"default:cobble",          "default:gravel"},
@@ -92,6 +92,7 @@ register_dust("Brass",           "technic:brass_ingot")
 register_dust("Bronze",          "default:bronze_ingot")
 register_dust("Carbon Steel",    "technic:carbon_steel_ingot")
 register_dust("Cast Iron",       "technic:cast_iron_ingot")
+register_dust("Chernobylite",    "technic:chernobylite_block")
 register_dust("Chromium",        "technic:chromium_ingot")
 register_dust("Coal",            nil)
 register_dust("Copper",          "default:copper_ingot")
@@ -100,11 +101,11 @@ register_dust("Gold",            "default:gold_ingot")
 register_dust("Mithril",         "moreores:mithril_ingot")
 register_dust("Silver",          "moreores:silver_ingot")
 register_dust("Stainless Steel", "technic:stainless_steel_ingot")
+register_dust("Stone",            "default:stone")
 register_dust("Sulfur",          nil)
 register_dust("Tin",             "moreores:tin_ingot")
 register_dust("Wrought Iron",    "technic:wrought_iron_ingot")
 register_dust("Zinc",            "technic:zinc_ingot")
-register_dust("Stone",            "default:stone")
 if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
 	register_dust("Akalin",          "glooptest:akalin_ingot")
 	register_dust("Alatro",          "glooptest:alatro_ingot")
diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua
index a94b9e2..0d32439 100644
--- a/technic/machines/supply_converter.lua
+++ b/technic/machines/supply_converter.lua
@@ -68,7 +68,7 @@ local run = function(pos, node, run_stage)
 	-- Machine information
 	local machine_name  = S("Supply Converter")
 	local meta          = minetest.get_meta(pos)
-	local enabled = meta:get_int("enabled") ~= 0 and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0)
+	local enabled = meta:get_string("enabled") ~= "0" and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0)
 	local demand = enabled and meta:get_int("power") or 0
 
 	local pos_up        = {x=pos.x, y=pos.y+1, z=pos.z}
diff --git a/technic/textures/technic_chernobylite_dust.png b/technic/textures/technic_chernobylite_dust.png
new file mode 100644
index 0000000..6f36bf6
--- /dev/null
+++ b/technic/textures/technic_chernobylite_dust.png
diff --git a/technic/textures/technicx32/technic_chernobylite_dust.png b/technic/textures/technicx32/technic_chernobylite_dust.png
new file mode 100644
index 0000000..b922db4
--- /dev/null
+++ b/technic/textures/technicx32/technic_chernobylite_dust.png