Merge https://github.com/h-v-smacker/technicHEADmaster

8 files changed, 162 insertions, 153 deletions

diff --git a/extranodes/cottonseed_oil.lua b/extranodes/cottonseed_oil.lua
new file mode 100644
index 0000000..25c0f9a
--- /dev/null
+++ b/extranodes/cottonseed_oil.lua
@@ -0,0 +1,37 @@
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+
+-- Cotton seed oil: fuel and fertilizer
+
+if minetest.get_modpath("farming") then
+	if minetest.get_modpath("bonemeal") then
+		minetest.register_craftitem(":technic:cottonseed_oil", {
+			description = S("Cottonseed Oil"),
+			inventory_image = "technic_cottonseed_oil.png",
+			on_use = function(itemstack, user, pointed_thing)
+				if pointed_thing.type ~= "node" then
+					return
+				end
+				if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
+					return
+				end
+				if not is_creative(user:get_player_name()) then
+					itemstack:take_item()
+				end
+				bonemeal:on_use(pointed_thing.under, 4)
+				return itemstack
+			end,
+		})
+	else
+		minetest.register_craftitem(":technic:cottonseed_oil", {
+			description = S("Cottonseed Oil"),
+			inventory_image = "technic_cottonseed_oil.png",
+		})
+	end
+
+	minetest.register_craft({
+		type = "fuel",
+		recipe = "technic:cottonseed_oil",
+		burntime = 20,
+	})
+
+end
diff --git a/extranodes/depends.txt b/extranodes/depends.txt
index 16a2b11..ff994f8 100644
--- a/extranodes/depends.txt
+++ b/extranodes/depends.txt
@@ -8,4 +8,3 @@ unifieddyes?
 intllib?
 moreblocks?
 pkarcs?
-
diff --git a/extranodes/diamonds.lua b/extranodes/diamonds.lua
new file mode 100644
index 0000000..96e1bd3
--- /dev/null
+++ b/extranodes/diamonds.lua
@@ -0,0 +1,14 @@
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+
+-- Artificial diamonds
+
+minetest.register_craftitem(":technic:diamond_seed", {
+	description = S("Diamond Seed"),
+	inventory_image = "technic_diamond_seed.png",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "technic:diamond_seed",
+	recipe = "technic:graphite"
+})
diff --git a/extranodes/init.lua b/extranodes/init.lua
index b7a0672..cd5ad34 100644
--- a/extranodes/init.lua
+++ b/extranodes/init.lua
@@ -3,19 +3,31 @@
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 
--- some extras to the extras
+
 local path = string.gsub(technic.modpath, "technic/technic", "technic/extranodes")
+
+-----------------------------------------------------------------------------------------
+--                           Introducing Extra Stuff
+-----------------------------------------------------------------------------------------
 dofile(path.."/aspirin.lua")
 dofile(path.."/trampoline.lua")
 dofile(path.."/extratubes.lua")
 dofile(path.."/extramesecons.lua")
 dofile(path.."/lox.lua")
 dofile(path.."/plastic_block.lua")
+dofile(path.."/diamonds.lua")
+dofile(path.."/insulator_clips.lua")
+dofile(path.."/cottonseed_oil.lua")
 
 if minetest.get_modpath("ethereal") and minetest.get_modpath("flowers") then
 	dofile(path.."/antishroom.lua")
 end
 
+
+-----------------------------------------------------------------------------------------
+--                           Compatibility Stuff and Co
+-----------------------------------------------------------------------------------------
+
 if minetest.get_modpath("bakedclay") then
 	-- bring back them sticks
 	minetest.register_craft( {
@@ -131,153 +143,5 @@ if minetest.get_modpath("moreblocks") then
 
 end
 
-local iclip_def = {
-	description = "Insulator/cable clip",
-	drawtype = "mesh",
-	mesh = "technic_insulator_clip.obj",
-	tiles = {"technic_insulator_clip.png"},
-	paramtype2 = "facedir",
-	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
-		},
-		-- 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 minetest.get_modpath("unifieddyes") then
-	iclip_def.paramtype2 = "colorwallmounted"
-	iclip_def.palette = "unifieddyes_palette_colorwallmounted.png"
-	iclip_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
-	end
-	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_place_node = unifieddyes.recolor_on_place
-	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
-end
-
-minetest.register_node(":technic:insulator_clip", iclip_def)
-minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
-
-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"},
-	}
-})
-
--- Artificial diamonds
-
-minetest.register_craftitem(":technic:diamond_seed", {
-	description = S("Diamond Seed"),
-	inventory_image = "technic_diamond_seed.png",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "technic:diamond_seed",
-	recipe = "technic:graphite"
-})
-
--- Cotton seed oil: fuel and fertilizer
-
-if minetest.get_modpath("farming") then
-	if minetest.get_modpath("bonemeal") then
-		minetest.register_craftitem(":technic:cottonseed_oil", {
-			description = S("Cottonseed Oil"),
-			inventory_image = "technic_cottonseed_oil.png",
-			on_use = function(itemstack, user, pointed_thing)
-				if pointed_thing.type ~= "node" then
-					return
-				end
-				if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
-					return
-				end
-				if not is_creative(user:get_player_name()) then
-					itemstack:take_item()
-				end
-				bonemeal:on_use(pointed_thing.under, 4)
-				return itemstack
-			end,
-		})
-	else
-		minetest.register_craftitem(":technic:cottonseed_oil", {
-			description = S("Cottonseed Oil"),
-			inventory_image = "technic_cottonseed_oil.png",
-		})
-	end
-
-	minetest.register_craft({
-		type = "fuel",
-		recipe = "technic:cottonseed_oil",
-		burntime = 20,
-	})
-
-end
-
-
--- -- Additional recipe for straw blocks out of straw mat from cottages (if present)
--- -- not to let the centifuge output go to waste, since farming:straw can be used with a saw...
--- 
--- if minetest.get_modpath("cottages") and minetest.get_modpath("farming") then
--- 	minetest.register_craft({
--- 		output = "farming:straw 2",
--- 		recipe = {
--- 			{ "cottages:straw_mat", "cottages:straw_mat", "cottages:straw_mat" },
--- 			{ "cottages:straw_mat", "cottages:straw_mat", "cottages:straw_mat" },
--- 			{ "cottages:straw_mat", "cottages:straw_mat", "cottages:straw_mat" },
--- 		}
--- 	})
--- end
 
 
diff --git a/extranodes/insulator_clips.lua b/extranodes/insulator_clips.lua
new file mode 100644
index 0000000..1672a61
--- /dev/null
+++ b/extranodes/insulator_clips.lua
@@ -0,0 +1,86 @@
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+
+local iclip_def = {
+	description = "Insulator/cable clip",
+	drawtype = "mesh",
+	mesh = "technic_insulator_clip.obj",
+	tiles = {"technic_insulator_clip.png"},
+	paramtype2 = "facedir",
+	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
+		},
+		-- 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 minetest.get_modpath("unifieddyes") then
+	iclip_def.paramtype2 = "colorwallmounted"
+	iclip_def.palette = "unifieddyes_palette_colorwallmounted.png"
+	iclip_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
+		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
+	end
+	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_place_node = unifieddyes.recolor_on_place
+	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
+end
+
+minetest.register_node(":technic:insulator_clip", iclip_def)
+minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
+
+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/depends.txt b/technic/depends.txt
index 55a0eff..d23e2a1 100644
--- a/technic/depends.txt
+++ b/technic/depends.txt
@@ -10,4 +10,5 @@ digiline_remote?
 intllib?
 unified_inventory?
 vector_extras?
-ehlphabet?
\ No newline at end of file
+ehlphabet?
+dye?
\ No newline at end of file
diff --git a/technic/machines/LV/cnc_nodes.lua b/technic/machines/LV/cnc_nodes.lua
index 42117a1..622629d 100644
--- a/technic/machines/LV/cnc_nodes.lua
+++ b/technic/machines/LV/cnc_nodes.lua
@@ -433,6 +433,14 @@ if minetest.get_modpath("maple") then
                 S("Maple"))
 end
 
+if minetest.get_modpath("extranodes") then
+	technic.cnc.register_all("technic:plastic_clean",
+                {dig_immediate = 2, not_in_creative_inventory=1},
+                {"technic_plastic_clean.png"},
+                S("Plastic Clean"))
+end
+
+
 
 if minetest.get_modpath("bakedclay") then
 	
diff --git a/technic/machines/other/constructor.lua b/technic/machines/other/constructor.lua
index 5847fdb..53dd9f4 100644
--- a/technic/machines/other/constructor.lua
+++ b/technic/machines/other/constructor.lua
@@ -73,14 +73,14 @@ minetest.register_craft({
 })
 minetest.register_craft({
 	type = "shapeless",
-	output = 'technic:constructor_mk2_off 1',
+	output = 'technic:constructor_mk2_off 2',
 	recipe = {'technic:constructor_mk1_off', 'technic:constructor_mk1_off'},
 
 })
 
 minetest.register_craft({
 	type = "shapeless",
-	output = 'technic:constructor_mk3_off 1',
+	output = 'technic:constructor_mk3_off 2',
 	recipe = {'technic:constructor_mk2_off', 'technic:constructor_mk2_off'},
 
 })