New texturing setup, Fix paramtype2 assignment for future versions

elepower_machines/machines/accumulator.lua

@@ -5,8 +5,9 @@ minetest.register_node("elepower_machines:accumulator", {
 	description = "Water Accumulator",
 	groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1},
 	tiles = {
-		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_accumulator.png",
+		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png^elepower_machine_accumulator.png",
-		"elepower_machine_accumulator.png", "elepower_machine_accumulator.png", "elepower_machine_accumulator.png",
+		"elepower_machine_side.png^elepower_machine_accumulator.png", "elepower_machine_side.png^elepower_machine_accumulator.png",
+		"elepower_machine_side.png^elepower_machine_accumulator.png",
 	},
 	fluid_buffers = {
 		water = {
@@ -24,8 +25,9 @@ minetest.register_node("elepower_machines:accumulator_heavy", {
 	description = "Water Accumulator (Heavy Water)",
 	groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1, not_in_creative_inventory = 1},
 	tiles = {
-		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_accumulator.png",
+		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png^elepower_machine_accumulator.png",
-		"elepower_machine_accumulator.png", "elepower_machine_accumulator.png", "elepower_machine_accumulator.png",
+		"elepower_machine_side.png^elepower_machine_accumulator.png", "elepower_machine_side.png^elepower_machine_accumulator.png",
+		"elepower_machine_side.png^elepower_machine_accumulator.png",
 	},
 	drop = {
 		max_items = 2,

elepower_machines/machines/alloy_furnace.lua

@@ -11,12 +11,12 @@ elepm.register_crafter("elepower_machines:alloy_furnace", {
 	ele_active_node = true,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_alloy_furnace.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_alloy_furnace.png",
 	},
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_alloy_furnace_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_alloy_furnace_active.png",
 		},
 	},
 	groups = {oddly_breakable_by_hand = 1}

elepower_machines/machines/bucketer.lua

@@ -159,7 +159,7 @@ ele.register_base_device("elepower_machines:bucketer", {
 	end,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_bucketer.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_bucketer.png",
 	},
 	on_receive_fields = get_fields,
 

elepower_machines/machines/canning_machine.lua

@@ -1,7 +1,7 @@
 
 elepm.register_craft_type("can", {
 	description = "Canning",
-	icon        = "elepower_canning_machine.png",
+	icon        = "elepower_machine_side.png^elepower_canning_machine.png",
 	inputs      = 2,
 })
 
@@ -10,7 +10,7 @@ elepm.register_crafter("elepower_machines:canning_machine", {
 	craft_type = "can",
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_canning_machine.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_canning_machine.png",
 	},
 	groups = {ele_user = 1, oddly_breakable_by_hand = 1},
 })

elepower_machines/machines/compressor.lua

@@ -1,7 +1,7 @@
 
 elepm.register_craft_type("compress", {
 	description = "Compressing",
-	icon        = "elepower_compressor.png",
+	icon        = "elepower_machine_side.png^elepower_compressor.png",
 	inputs      = 1,
 })
 
@@ -11,7 +11,8 @@ elepm.register_crafter("elepower_machines:compressor", {
 	ele_usage = 32,
 	tiles = {
 		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_power_port.png",
-		"elepower_compressor.png", "elepower_compressor.png", "elepower_compressor.png", "elepower_compressor.png",
+		"elepower_machine_side.png^elepower_compressor.png", "elepower_machine_side.png^elepower_compressor.png",
+		"elepower_machine_side.png^elepower_compressor.png", "elepower_machine_side.png^elepower_compressor.png",
 	},
 	ele_no_automatic_ports = true,
 	groups = {oddly_breakable_by_hand = 1}

elepower_machines/machines/electrolyzer.lua

@@ -161,7 +161,7 @@ ele.register_machine("elepower_machines:electrolyzer", {
 	description = "Electrolyzer",
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_electrolyzer.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_electrolyzer.png",
 	},
 	groups = {fluid_container = 1, cracky = 1, ele_user = 1},
 	on_timer = electrolyzer_timer,

elepower_machines/machines/evaporator.lua

@@ -101,7 +101,7 @@ local function on_timer(pos, elapsed)
 end
 
 local animated = {
-	name = "elepower_machine_vaporidenser_animated.png",
+	name = "elepower_machine_base.png^elepower_machine_vaporidenser_animated.png",
 	animation = {
 		type = "vertical_frames",
 		aspect_w = 16,
@@ -132,7 +132,7 @@ ele.register_machine("elepower_machines:evaporator", {
 	end,
 	tiles = {
 		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_power_port.png",
-		"elepower_machine_vaporidenser.png",
+		"elepower_machine_side.png^elepower_machine_vaporidenser.png",
 	},
 	ele_active_node = true,
 	ele_no_automatic_ports = true,

elepower_machines/machines/fuel_burner.lua

@@ -4,13 +4,13 @@ ele.register_fluid_generator("elepower_machines:fuel_burner", {
 	ele_usage = 8,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_fuel_generator.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_fuel_generator.png",
 	},
 	ele_active_node = true,
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_fuel_generator_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_fuel_generator_active.png",
 		},
 	},
 	fluid_buffers = {

elepower_machines/machines/furnace.lua

@@ -10,12 +10,12 @@ elepm.register_crafter("elepower_machines:furnace", {
 	ele_usage = 32,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_furnace.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_furnace.png",
 	},
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_furnace_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_furnace_active.png",
 		},
 	},
 	groups = {oddly_breakable_by_hand = 1}

elepower_machines/machines/generator.lua

@@ -10,12 +10,12 @@ elepm.register_fuel_generator("elepower_machines:generator", {
 	ele_usage = 16,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_generator.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_generator.png",
 	},
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_generator_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_generator_active.png",
 		}
 	},
 	groups = {oddly_breakable_by_hand = 1}

elepower_machines/machines/lava_cooler.lua

@@ -140,7 +140,7 @@ ele.register_machine("elepower_machines:lava_cooler", {
 	},
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_cooler.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_cooler.png",
 	},
 	on_construct = function (pos)
 		local meta = minetest.get_meta(pos)

elepower_machines/machines/lava_generator.lua

@@ -4,13 +4,13 @@ ele.register_fluid_generator("elepower_machines:lava_generator", {
 	ele_usage = 64,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_generator.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_generator.png",
 	},
 	ele_active_node = true,
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_generator_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_generator_active.png",
 		},
 	},
 	fluid_buffers = {

elepower_machines/machines/pulverizer.lua

@@ -12,12 +12,12 @@ elepm.register_crafter("elepower_machines:pulverizer", {
 	ele_usage = 32,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_grinder.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_grinder.png",
 	},
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_grinder_active.png",
+			"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_grinder_active.png",
 		},
 	},
 	groups = {oddly_breakable_by_hand = 1}

elepower_machines/machines/pump.lua

@@ -211,8 +211,10 @@ end
 ele.register_machine("elepower_machines:pump", {
 	description = "Pump",
 	tiles = {
-		"elepower_machine_top.png^elepower_power_port.png", "elepower_pump_base.png", "elepower_pump_side.png",
+		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_pump_base.png",
-		"elepower_pump_side.png", "elepower_pump_side.png", "elepower_pump_side.png",
+		"elepower_machine_side.png^elepower_pump_side.png",
+		"elepower_machine_side.png^elepower_pump_side.png", "elepower_machine_side.png^elepower_pump_side.png",
+		"elepower_machine_side.png^elepower_pump_side.png",
 	},
 	groups = {
 		ele_machine     = 1,

elepower_machines/machines/sawmill.lua

@@ -3,7 +3,7 @@ elepm.register_craft_type("saw", {
 	description = "Sawmilling",
 	inputs      = 1,
 	gui_name    = "elepower_saw",
-	icon        = "elepower_sawmill.png",
+	icon        = "elepower_machine_side.png^elepower_sawmill.png",
 })
 
 elepm.register_crafter("elepower_machines:sawmill", {
@@ -12,7 +12,7 @@ elepm.register_crafter("elepower_machines:sawmill", {
 	ele_usage = 32,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_sawmill.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_sawmill.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })

elepower_machines/machines/solderer.lua

@@ -2,7 +2,7 @@
 elepm.register_craft_type("solder", {
 	description = "Soldering",
 	inputs      = 3,
-	icon        = "elepower_solderer.png",
+	icon        = "elepower_machine_side.png^elepower_solderer.png",
 })
 
 elepm.register_crafter("elepower_machines:solderer", {
@@ -10,7 +10,7 @@ elepm.register_crafter("elepower_machines:solderer", {
 	craft_type = "solder",
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_solderer.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_solderer.png",
 	},
 	groups = {oddly_breakable_by_hand = 1, cracky = 2},
 	ele_usage = 128,

elepower_machines/machines/steam_turbine.lua

@@ -18,13 +18,13 @@ ele.register_fluid_generator("elepower_machines:steam_turbine", {
 	ele_output = 128,
 	tiles = {
 		"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_turbine_side.png", "elepower_turbine_side.png",
+		"elepower_machine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", "elepower_machine_side.png^elepower_turbine_side.png",
 	},
 	ele_active_node = true,
 	ele_active_nodedef = {
 		tiles = {
 			"elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png",
-			"elepower_machine_side.png", "elepower_turbine_side.png", "elepower_turbine_side.png",
+			"elepower_machine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", "elepower_machine_side.png^elepower_turbine_side.png",
 		},
 	},
 	fluid_buffers = {

elepower_machines/machines/storage.lua

@@ -10,7 +10,7 @@ elepm.register_storage("elepower_machines:power_cell", {
 	ele_output = 128,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_power_cell.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_power_cell.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })
@@ -26,7 +26,7 @@ elepm.register_storage("elepower_machines:hardened_power_cell", {
 		"elepower_machine_side.png^elepower_overlay_hardened.png",
 		"elepower_machine_side.png^elepower_overlay_hardened.png",
 		"elepower_machine_side.png^elepower_overlay_hardened.png",
-		"elepower_power_cell.png^elepower_overlay_hardened.png",
+		"elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_hardened.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })
@@ -42,7 +42,7 @@ elepm.register_storage("elepower_machines:reinforced_power_cell", {
 		"elepower_machine_side.png^elepower_overlay_reinforced.png",
 		"elepower_machine_side.png^elepower_overlay_reinforced.png",
 		"elepower_machine_side.png^elepower_overlay_reinforced.png",
-		"elepower_power_cell.png^elepower_overlay_reinforced.png",
+		"elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_reinforced.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })
@@ -58,7 +58,7 @@ elepm.register_storage("elepower_machines:resonant_power_cell", {
 		"elepower_machine_side.png^elepower_overlay_resonant.png",
 		"elepower_machine_side.png^elepower_overlay_resonant.png",
 		"elepower_machine_side.png^elepower_overlay_resonant.png",
-		"elepower_power_cell.png^elepower_overlay_resonant.png",
+		"elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_resonant.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })
@@ -74,7 +74,7 @@ elepm.register_storage("elepower_machines:super_power_cell", {
 		"elepower_machine_side.png^elepower_overlay_super.png",
 		"elepower_machine_side.png^elepower_overlay_super.png",
 		"elepower_machine_side.png^elepower_overlay_super.png",
-		"elepower_power_cell.png^elepower_overlay_super.png",
+		"elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_super.png",
 	},
 	groups = {oddly_breakable_by_hand = 1}
 })

elepower_machines/machines/wind_turbine.lua

@@ -121,7 +121,7 @@ ele.register_wind_generator("elepower_machines:wind_turbine", {
 	description = "Wind Turbine\nRequires Wind Turbine Blades",
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_wind_turbine_face.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_wind_turbine_face.png",
 	},
 	ele_upgrades = {
 		capacitor = {"capacity"},

elepower_mining/miner.lua

@@ -265,8 +265,10 @@ minetest.register_node("elepower_mining:miner_core", {
 minetest.register_node("elepower_mining:miner_drill", {
 	description = "Miner Drill\nMachine Component",
 	tiles = {
-		"elepower_machine_top.png^elepower_power_port.png", "elepower_mining_apparatus_base.png", "elepower_mining_apparatus_side.png",
+		"elepower_machine_top.png^elepower_power_port.png", "elepower_mining_apparatus_base.png",
-		"elepower_mining_apparatus_side.png", "elepower_mining_apparatus_side.png", "elepower_mining_apparatus_side.png",
+		"elepower_machine_side.png^elepower_mining_apparatus_side.png",
+		"elepower_machine_side.png^elepower_mining_apparatus_side.png",
+		"elepower_machine_side.png^elepower_mining_apparatus_side.png", "elepower_machine_side.png^elepower_mining_apparatus_side.png",
 	},
 	groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1},
 	after_dig_node = recalc_on_break,

elepower_papi/machine.lua

@@ -474,6 +474,8 @@ function ele.register_machine(nodename, nodedef)
 
 	if nodedef.paramtype2 ~= 0 or not nodedef.paramtype2 then
 		nodedef.paramtype2 = "facedir"
+	else
+		nodedef.paramtype2 = nil
 	end
 
 	-- Ensure machine group is used properly

elepower_tools/ed_reconstructor.lua

@@ -116,7 +116,7 @@ ele.register_machine("elepower_tools:ed_reconstructor", {
 	description = "Energy Density Reconstructor\nRepairs tools using energy",
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
-		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_ed_reconstructor.png",
+		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_machine_ed_reconstructor.png",
 	},
 	groups = {cracky = 1, ele_user = 1},
 	on_timer = ed_timer,