update pipeworks and technic

17 files changed, 61 insertions, 43 deletions

diff --git a/technic/crafts.lua b/technic/crafts.lua
index 4859768..9e07978 100644
--- a/technic/crafts.lua
+++ b/technic/crafts.lua
@@ -1,6 +1,23 @@
 -- check if we have the necessary dependencies to allow actually using these materials in the crafts
 local mesecons_materials = minetest.get_modpath("mesecons_materials")
 
+-- Remove some recipes
+-- Bronze
+minetest.clear_craft({
+	type = "shapeless",
+	output = "default:bronze_ingot"
+})
+
+-- Accelerator tube
+minetest.clear_craft({
+	output = "pipeworks:accelerator_tube_1",
+})
+
+-- Teleport tube
+minetest.clear_craft({
+	output = "pipeworks:teleport_tube_1",
+})
+
 -- tubes crafting recipes
 
 minetest.register_craft({
@@ -163,33 +180,6 @@ minetest.register_craft({
 	},
 })
 
--- Remove some recipes
--- Bronze
-minetest.register_craft({
-	type = "shapeless",
-	output = "default:bronze_ingot 0",
-	recipe = {"default:copper_ingot", "default:steel_ingot"}
-})
-
--- Accelerator tube
-minetest.register_craft({
-	output = "pipeworks:accelerator_tube_1 0",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
-
--- Teleport tube
-minetest.register_craft({
-	output = "pipeworks:teleport_tube_1 0",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:desert_stone", "default:mese", "default:desert_stone" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
 
 minetest.register_craft({
 	output = "default:dirt 2",
diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua
index 7238d6d..5b298a7 100644
--- a/technic/machines/register/battery_box.lua
+++ b/technic/machines/register/battery_box.lua
@@ -3,6 +3,7 @@ local digilines_path = minetest.get_modpath("digilines")
 
 local S = technic.getter
 local tube_entry = "^pipeworks_tube_connection_metallic.png"
+local cable_entry = "^technic_cable_connection_overlay.png"
 
 local fs_helpers = pipeworks.fs_helpers
 
@@ -132,7 +133,14 @@ function technic.register_battery_box(data)
 	end
 
 	local run = function(pos, node)
+		local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z})
 		local meta           = minetest.get_meta(pos)
+
+		if below.name ~= "technic:"..ltier.."_cable" then
+			meta:set_string("infotext", S("%s Battery Box Has No Network"):format(tier))
+			return
+		end
+
 		local eu_input       = meta:get_int(tier.."_EU_input")
 		local current_charge = meta:get_int("internal_EU_charge")
 
@@ -208,20 +216,27 @@ function technic.register_battery_box(data)
 			groups.tubedevice_receiver = 1
 		end
 
-		local tentry = tube_entry
+		local top_tex = "technic_"..ltier.."_battery_box_top.png"..tube_entry
+		local front_tex = "technic_"..ltier.."_battery_box_front.png^technic_power_meter"..i..".png"
+		local side_tex = "technic_"..ltier.."_battery_box_side.png"..tube_entry
+		local bottom_tex = "technic_"..ltier.."_battery_box_bottom.png"..tube_entry
+
 		if ltier == "lv" then
-			tentry = ""
+			top_tex = "technic_"..ltier.."_battery_box_top.png"
+			front_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"
+			side_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"
+			bottom_tex = "technic_"..ltier.."_battery_box_bottom.png"..cable_entry
 		end
 
 		minetest.register_node("technic:"..ltier.."_battery_box"..i, {
 			description = S("%s Battery Box"):format(tier),
 			tiles = {
-				"technic_"..ltier.."_battery_box_top.png"..tentry,
-				"technic_"..ltier.."_battery_box_bottom.png"..tentry,
-				"technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
-				"technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
-				"technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
-				"technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"},
+				top_tex,
+				bottom_tex,
+				side_tex,
+				side_tex,
+				side_tex,
+				front_tex},
 			groups = groups,
 			connect_sides = {"bottom"},
 			tube = data.tube and tube or nil,
diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua
index b0e2e06..d65c399 100644
--- a/technic/machines/register/cables.lua
+++ b/technic/machines/register/cables.lua
@@ -182,7 +182,7 @@ function technic.register_cable(tier, size)
 			tiles = {"technic_"..ltier.."_cable.png"},
 			groups = table.copy(groups),
 			sounds = default.node_sound_wood_defaults(),
-			drop = "technic:"..ltier.."_cable",
+			drop = "technic:"..ltier.."_cable_plate_1",
 			paramtype = "light",
 			sunlight_propagates = true,
 			drawtype = "nodebox",
@@ -210,6 +210,10 @@ function technic.register_cable(tier, size)
 					end
 				end
 				minetest.set_node(pointed_thing.above, {name = "technic:"..ltier.."_cable_plate_"..num})
+				if not (creative and creative.is_enabled_for(placer)) then
+					itemstack:take_item()
+				end
+				return itemstack
 			end
 		else
 			def.groups.not_in_creative_inventory = 1
@@ -227,6 +231,13 @@ function technic.register_cable(tier, size)
 			{"", "", c},
 		}
 	})
+
+	minetest.register_craft({
+		output = c,
+		recipe = {
+			{"technic:"..ltier.."_cable_plate_1"},
+		}
+	})
 end
 
 
diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua
index 9062d09..7805bf0 100644
--- a/technic/machines/register/generator.lua
+++ b/technic/machines/register/generator.lua
@@ -108,14 +108,17 @@ function technic.register_generator(data)
 		)
 	end
 
+	local tentry = tube_entry
+	if ltier == "lv" then tentry = "" end
+
 	minetest.register_node("technic:"..ltier.."_generator", {
 		description = desc,
 		tiles = {
-				"technic_"..ltier.."_generator_top.png"..tube_entry,
-				"technic_machine_bottom.png"..tube_entry,
-				"technic_"..ltier.."_generator_side.png"..tube_entry,
-				"technic_"..ltier.."_generator_side.png"..tube_entry,
-				"technic_"..ltier.."_generator_side.png"..tube_entry,
+				"technic_"..ltier.."_generator_top.png"..tentry,
+				"technic_machine_bottom.png"..tentry,
+				"technic_"..ltier.."_generator_side.png"..tentry,
+				"technic_"..ltier.."_generator_side.png"..tentry,
+				"technic_"..ltier.."_generator_side.png"..tentry,
 				"technic_"..ltier.."_generator_front.png"
 		}, 
 		paramtype2 = "facedir",
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 7ba1e0f..64eb8e1 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -30,8 +30,7 @@ local recipes = {
 }
 
 -- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe)
-minetest.register_craft({
-	output = "default:sandstone 0",
+minetest.clear_craft({
 	recipe = {
 		{'default:sandstone'}
 	},
diff --git a/technic/textures/technic_cable_connection_overlay.png b/technic/textures/technic_cable_connection_overlay.png
index 122cad2..e013c53 100644
--- a/technic/textures/technic_cable_connection_overlay.png
+++ b/technic/textures/technic_cable_connection_overlay.png
diff --git a/technic/textures/technic_hv_battery_box_bottom.png b/technic/textures/technic_hv_battery_box_bottom.png
index 996b2d4..940dcdb 100644
--- a/technic/textures/technic_hv_battery_box_bottom.png
+++ b/technic/textures/technic_hv_battery_box_bottom.png
diff --git a/technic/textures/technic_hv_battery_box_front.png b/technic/textures/technic_hv_battery_box_front.png
new file mode 100644
index 0000000..6f23439
--- /dev/null
+++ b/technic/textures/technic_hv_battery_box_front.png
diff --git a/technic/textures/technic_hv_battery_box_side.png b/technic/textures/technic_hv_battery_box_side.png
index fffd8ea..3e99d8c 100644
--- a/technic/textures/technic_hv_battery_box_side.png
+++ b/technic/textures/technic_hv_battery_box_side.png
diff --git a/technic/textures/technic_hv_battery_box_top.png b/technic/textures/technic_hv_battery_box_top.png
index 49dee71..aa6fdb6 100644
--- a/technic/textures/technic_hv_battery_box_top.png
+++ b/technic/textures/technic_hv_battery_box_top.png
diff --git a/technic/textures/technic_lv_battery_box_bottom.png b/technic/textures/technic_lv_battery_box_bottom.png
index a6124e6..0894d5f 100644
--- a/technic/textures/technic_lv_battery_box_bottom.png
+++ b/technic/textures/technic_lv_battery_box_bottom.png
diff --git a/technic/textures/technic_lv_battery_box_side.png b/technic/textures/technic_lv_battery_box_side.png
index 24d4e4e..4d435ac 100644
--- a/technic/textures/technic_lv_battery_box_side.png
+++ b/technic/textures/technic_lv_battery_box_side.png
diff --git a/technic/textures/technic_lv_battery_box_top.png b/technic/textures/technic_lv_battery_box_top.png
index b32100f..6050ad0 100644
--- a/technic/textures/technic_lv_battery_box_top.png
+++ b/technic/textures/technic_lv_battery_box_top.png
diff --git a/technic/textures/technic_mv_battery_box_bottom.png b/technic/textures/technic_mv_battery_box_bottom.png
index a610660..0894d5f 100644
--- a/technic/textures/technic_mv_battery_box_bottom.png
+++ b/technic/textures/technic_mv_battery_box_bottom.png
diff --git a/technic/textures/technic_mv_battery_box_front.png b/technic/textures/technic_mv_battery_box_front.png
new file mode 100644
index 0000000..63ed41c
--- /dev/null
+++ b/technic/textures/technic_mv_battery_box_front.png
diff --git a/technic/textures/technic_mv_battery_box_side.png b/technic/textures/technic_mv_battery_box_side.png
index 06a4be5..2528ff8 100644
--- a/technic/textures/technic_mv_battery_box_side.png
+++ b/technic/textures/technic_mv_battery_box_side.png
diff --git a/technic/textures/technic_mv_battery_box_top.png b/technic/textures/technic_mv_battery_box_top.png
index b32100f..6050ad0 100644
--- a/technic/textures/technic_mv_battery_box_top.png
+++ b/technic/textures/technic_mv_battery_box_top.png