Introduce utility function for deriving table fields

api/common.lua

@@ -56,6 +56,16 @@ function industrialtest.internal.unpackTableInto(first,second)
 	end
 end
 
+-- \brief Copies table passed in super while overriding fields with those from override and returns result
+-- \param super table
+-- \param override table
+-- \returns table
+function industrialtest.internal.derive(super,override)
+	local result=table.copy(super)
+	industrialtest.internal.unpackTableInto(result,override)
+	return result
+end
+
 -- \brief Returns machine speed in items per operation
 -- \param meta MetaDataRef
 -- \returns number

machines/activated_electric_machine.lua

@@ -14,10 +14,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-industrialtest.ActivatedElectricMachine=table.copy(industrialtest.ElectricMachine)
+industrialtest.ActivatedElectricMachine=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-
 	-- Forward methods from ActivatedMachine
-industrialtest.internal.unpackTableInto(industrialtest.ActivatedElectricMachine,{
 	canUpdate=industrialtest.ActivatedMachine.canUpdate,
 	register=industrialtest.ActivatedMachine.register,
 	createDefinitionTable=industrialtest.ActivatedMachine.createDefinitionTable,

machines/cable_former.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.CableFormer=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.CableFormer=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.CableFormer,{
 	name="industrialtest:cable_former",
 	description=S("Cable Former"),
 	tiles={

machines/canning_machine.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.CanningMachine=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.CanningMachine=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.CanningMachine,{
 	name="industrialtest:canning_machine",
 	description=S("Canning Machine"),
 	tiles={

machines/chargepad.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 industrialtest.internal.chargepads={}
-industrialtest.Chargepad=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.Chargepad=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Chargepad,{
 	storageLists={
 		"charged",
 		"discharged"
@@ -170,8 +169,7 @@ function industrialtest.Chargepad.action(self,pos,node)
 	end
 end
 
-industrialtest.BatboxChargepad=table.copy(industrialtest.Chargepad)
+industrialtest.BatboxChargepad=industrialtest.internal.derive(industrialtest.Chargepad,{
-industrialtest.internal.unpackTableInto(industrialtest.BatboxChargepad,{
 	name="industrialtest:batbox_chargepad",
 	description=S("BatBox Chargepad"),
 	tiles={
@@ -199,8 +197,7 @@ industrialtest.internal.unpackTableInto(industrialtest.BatboxChargepad,{
 })
 industrialtest.BatboxChargepad:register()
 
-industrialtest.CESUChargepad=table.copy(industrialtest.Chargepad)
+industrialtest.CESUChargepad=industrialtest.internal.derive(industrialtest.Chargepad,{
-industrialtest.internal.unpackTableInto(industrialtest.CESUChargepad,{
 	name="industrialtest:cesu_chargepad",
 	description=S("CESU Chargepad"),
 	tiles={
@@ -228,8 +225,7 @@ industrialtest.internal.unpackTableInto(industrialtest.CESUChargepad,{
 })
 industrialtest.CESUChargepad:register()
 
-industrialtest.MFEChargepad=table.copy(industrialtest.Chargepad)
+industrialtest.MFEChargepad=industrialtest.internal.derive(industrialtest.Chargepad,{
-industrialtest.internal.unpackTableInto(industrialtest.MFEChargepad,{
 	name="industrialtest:mfe_chargepad",
 	description=S("MFE Chargepad"),
 	tiles={
@@ -258,8 +254,7 @@ industrialtest.internal.unpackTableInto(industrialtest.MFEChargepad,{
 })
 industrialtest.MFEChargepad:register()
 
-industrialtest.MFSUChargepad=table.copy(industrialtest.Chargepad)
+industrialtest.MFSUChargepad=industrialtest.internal.derive(industrialtest.Chargepad,{
-industrialtest.internal.unpackTableInto(industrialtest.MFSUChargepad,{
 	name="industrialtest:mfsu_chargepad",
 	description=S("MFSU Chargepad"),
 	tiles={

machines/compressor.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Compressor=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.Compressor=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.Compressor,{
 	name="industrialtest:compressor",
 	description=S("Compressor"),
 	tiles={

machines/electric_furnace.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ElectricFurnace=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.ElectricFurnace=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricFurnace,{
 	name="industrialtest:electric_furnace",
 	description=S("Electric Furnace"),
 	tiles={

machines/extractor.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Extractor=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.Extractor=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.Extractor,{
 	name="industrialtest:extractor",
 	description=S("Extractor"),
 	tiles={

machines/fluid_generator.lua

@@ -117,8 +117,7 @@ local function generate(self,pos,elapsed)
 	return false
 end
 
-industrialtest.GeothermalGenerator=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.GeothermalGenerator=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.GeothermalGenerator,{
 	name="industrialtest:geothermal_generator",
 	description=S("Geothermal Generator"),
 	tiles={
@@ -243,8 +242,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.WaterMill=table.copy(industrialtest.ElectricMachine)
+industrialtest.WaterMill=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.WaterMill,{
 	name="industrialtest:water_mill",
 	description=S("Water Mill"),
 	tiles={

machines/generator.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Generator=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.Generator=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Generator,{
 	name="industrialtest:generator",
 	description=S("Generator"),
 	tiles={

machines/induction_furnace.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.InductionFurnace=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.InductionFurnace=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.InductionFurnace,{
 	name="industrialtest:induction_furnace",
 	description=S("Induction Furnace"),
 	tiles={

machines/iron_furnace.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.IronFurnace=table.copy(industrialtest.ActivatedMachine)
+industrialtest.IronFurnace=industrialtest.internal.derive(industrialtest.ActivatedMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.IronFurnace,{
 	name="industrialtest:iron_furnace",
 	description=S("Iron Furnace"),
 	tiles={

machines/macerator.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Macerator=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.Macerator=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.Macerator,{
 	name="industrialtest:macerator",
 	description=S("Macerator"),
 	tiles={

machines/magnetizer.lua

@@ -72,8 +72,7 @@ local function hasMetalBoots(player)
 	return false
 end
 
-industrialtest.Magnetizer=table.copy(industrialtest.ElectricMachine)
+industrialtest.Magnetizer=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Magnetizer,{
 	name="industrialtest:magnetizer",
 	description=S("Magnetizer"),
 	tiles={

machines/mass_fabricator.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.MassFabricator=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.MassFabricator=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.MassFabricator,{
 	name="industrialtest:mass_fabricator",
 	description=S("Mass Fabricator"),
 	tiles={

machines/miner.lua

@@ -119,8 +119,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.Miner=table.copy(industrialtest.ElectricMachine)
+industrialtest.Miner=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Miner,{
 	name="industrialtest:miner",
 	description=S("Miner"),
 	tiles={

machines/nuclear_reactor.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Reactor=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.Reactor=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Reactor,{
 	name="industrialtest:nuclear_reactor",
 	description=S("Nuclear Reactor"),
 	tiles={
@@ -366,8 +365,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.ReactorChamber=table.copy(industrialtest.Machine)
+industrialtest.ReactorChamber=industrialtest.internal.derive(industrialtest.Machine,{
-industrialtest.internal.unpackTableInto(industrialtest.ReactorChamber,{
 	name="industrialtest:nuclear_reactor_chamber",
 	description=S("Nuclear Reactor Chamber"),
 	tiles={"industrialtest_machine_block.png^industrialtest_nuclear_reactor_top.png"},

machines/power_storage.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.PowerStorage=table.copy(industrialtest.ElectricMachine)
+industrialtest.PowerStorage=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.PowerStorage,{
 	facedir=true,
 	storageLists={
 		"charged",
@@ -63,8 +62,7 @@ function industrialtest.PowerStorage.getFormspec(self,pos)
 	return parentFormspec..table.concat(formspec,"")
 end
 
-industrialtest.BatBox=table.copy(industrialtest.PowerStorage)
+industrialtest.BatBox=industrialtest.internal.derive(industrialtest.PowerStorage,{
-industrialtest.internal.unpackTableInto(industrialtest.BatBox,{
 	name="industrialtest:batbox",
 	description=S("BatBox"),
 	tiles={
@@ -92,8 +90,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.CESU=table.copy(industrialtest.PowerStorage)
+industrialtest.CESU=industrialtest.internal.derive(industrialtest.PowerStorage,{
-industrialtest.internal.unpackTableInto(industrialtest.CESU,{
 	name="industrialtest:cesu",
 	description=S("CESU"),
 	tiles={
@@ -121,8 +118,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.MFE=table.copy(industrialtest.PowerStorage)
+industrialtest.MFE=industrialtest.internal.derive(industrialtest.PowerStorage,{
-industrialtest.internal.unpackTableInto(industrialtest.MFE,{
 	name="industrialtest:mfe",
 	description=S("MFE"),
 	tiles={
@@ -152,8 +148,7 @@ minetest.register_craft({
 })
 
 
-industrialtest.MFSU=table.copy(industrialtest.PowerStorage)
+industrialtest.MFSU=industrialtest.internal.derive(industrialtest.PowerStorage,{
-industrialtest.internal.unpackTableInto(industrialtest.MFSU,{
 	name="industrialtest:mfsu",
 	description=S("MFSU"),
 	tiles={

machines/pump.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Pump=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.Pump=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Pump,{
 	name="industrialtest:pump",
 	description=S("Pump"),
 	tiles={

machines/recycler.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Recycler=table.copy(industrialtest.SimpleElectricItemProcessor)
+industrialtest.Recycler=industrialtest.internal.derive(industrialtest.SimpleElectricItemProcessor,{
-industrialtest.internal.unpackTableInto(industrialtest.Recycler,{
 	name="industrialtest:recycler",
 	description=S("Recycler"),
 	tiles={

machines/rotary_macerator.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.RotaryMacerator=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.RotaryMacerator=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.RotaryMacerator,{
 	name="industrialtest:rotary_macerator",
 	description=S("Rotary Macerator"),
 	tiles={

machines/simple_electric_item_processor.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.SimpleElectricItemProcessor=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.SimpleElectricItemProcessor=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.SimpleElectricItemProcessor,{
 	facedir=true,
 	sounds="metal",
 	storageLists={

machines/solar_panel_generator.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.SolarPanelBase=table.copy(industrialtest.ElectricMachine)
+industrialtest.SolarPanelBase=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.SolarPanelBase,{
 	sounds="metal",
 	requiresWrench=true,
 	storageLists={
@@ -78,8 +77,7 @@ function industrialtest.SolarPanelBase.action(self,pos)
 	end
 end
 
-industrialtest.SolarPanel=table.copy(industrialtest.SolarPanelBase)
+industrialtest.SolarPanel=industrialtest.internal.derive(industrialtest.SolarPanelBase,{
-industrialtest.internal.unpackTableInto(industrialtest.SolarPanel,{
 	name="industrialtest:solar_panel",
 	description=S("Solar Panel"),
 	tiles={
@@ -106,8 +104,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.LVSolarArray=table.copy(industrialtest.SolarPanelBase)
+industrialtest.LVSolarArray=industrialtest.internal.derive(industrialtest.SolarPanelBase,{
-industrialtest.internal.unpackTableInto(industrialtest.LVSolarArray,{
 	name="industrialtest:lv_solar_array",
 	description=S("LV Solar Array"),
 	tiles={
@@ -135,8 +132,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.MVSolarArray=table.copy(industrialtest.SolarPanelBase)
+industrialtest.MVSolarArray=industrialtest.internal.derive(industrialtest.SolarPanelBase,{
-industrialtest.internal.unpackTableInto(industrialtest.MVSolarArray,{
 	name="industrialtest:mv_solar_array",
 	description=S("MV Solar Array"),
 	tiles={
@@ -164,8 +160,7 @@ minetest.register_craft({
 })
 
 
-industrialtest.HVSolarArray=table.copy(industrialtest.SolarPanelBase)
+industrialtest.HVSolarArray=industrialtest.internal.derive(industrialtest.SolarPanelBase,{
-industrialtest.internal.unpackTableInto(industrialtest.HVSolarArray,{
 	name="industrialtest:hv_solar_array",
 	description=S("HV Solar Array"),
 	tiles={

machines/tool_workshop.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ToolWorkshop=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.ToolWorkshop=industrialtest.internal.derive(industrialtest.ActivatedElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.ToolWorkshop,{
 	name="industrialtest:tool_workshop",
 	description=S("Tool Workshop"),
 	tiles={

machines/transformer.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Transformer=table.copy(industrialtest.ElectricMachine)
+industrialtest.Transformer=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.Transformer,{
 	withoutFormspec=true,
 	facedir=true,
 	storageLists={},
@@ -59,8 +58,7 @@ function industrialtest.Transformer.onPowerFlow(self,pos)
 	self:trigger(pos)
 end
 
-industrialtest.LVTransformer=table.copy(industrialtest.Transformer)
+industrialtest.LVTransformer=industrialtest.internal.derive(industrialtest.Transformer,{
-industrialtest.internal.unpackTableInto(industrialtest.LVTransformer,{
 	name="industrialtest:lv_transformer",
 	description=S("LV Transformer"),
 	sounds="wood",
@@ -89,8 +87,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.MVTransformer=table.copy(industrialtest.Transformer)
+industrialtest.MVTransformer=industrialtest.internal.derive(industrialtest.Transformer,{
-industrialtest.internal.unpackTableInto(industrialtest.MVTransformer,{
 	name="industrialtest:mv_transformer",
 	description=S("MV Transformer"),
 	sounds="metal",
@@ -120,8 +117,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.HVTransformer=table.copy(industrialtest.Transformer)
+industrialtest.HVTransformer=industrialtest.internal.derive(industrialtest.Transformer,{
-industrialtest.internal.unpackTableInto(industrialtest.HVTransformer,{
 	name="industrialtest:hv_transformer",
 	description=S("HV Transformer"),
 	sounds="metal",
@@ -151,8 +147,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.EVTransformer=table.copy(industrialtest.Transformer)
+industrialtest.EVTransformer=industrialtest.internal.derive(industrialtest.Transformer,{
-industrialtest.internal.unpackTableInto(industrialtest.EVTransformer,{
 	name="industrialtest:ev_transformer",
 	description=S("EV Transformer"),
 	sounds="metal",

machines/wind_mill.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.WindMill=table.copy(industrialtest.ElectricMachine)
+industrialtest.WindMill=industrialtest.internal.derive(industrialtest.ElectricMachine,{
-industrialtest.internal.unpackTableInto(industrialtest.WindMill,{
 	name="industrialtest:wind_mill",
 	description=S("Wind Mill"),
 	tiles={

tools/batpack.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.BatPackBase=table.copy(industrialtest.ElectricGearTool)
+industrialtest.BatPackBase=industrialtest.internal.derive(industrialtest.ElectricGearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.BatPackBase,{
 	part="torso"
 })
 
@@ -41,8 +40,7 @@ function industrialtest.BatPackBase.update(self,player,inv,itemstack,dtime)
 	return false
 end
 
-industrialtest.BatPack=table.copy(industrialtest.BatPackBase)
+industrialtest.BatPack=industrialtest.internal.derive(industrialtest.BatPackBase,{
-industrialtest.internal.unpackTableInto(industrialtest.BatPack,{
 	name="industrialtest:batpack_v",
 	description=S("BatPack"),
 	inventoryImage="industrialtest_batpack_v_inv.png",
@@ -63,8 +61,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.LapPack=table.copy(industrialtest.BatPackBase)
+industrialtest.LapPack=industrialtest.internal.derive(industrialtest.BatPackBase,{
-industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
 	name="industrialtest:lappack_v",
 	description=S("LapPack"),
 	inventoryImage="industrialtest_lappack_v_inv.png",

tools/electric_chainsaw.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ElectricChainsawBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.ElectricChainsawBase=industrialtest.internal.derive(industrialtest.ActivatedElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricChainsawBase,{
 	digs={"choppy"}
 })
 
@@ -33,8 +32,7 @@ function industrialtest.ElectricChainsawBase.getOpPower(self,itemstack)
 	return 50
 end
 
-industrialtest.ElectricChainsaw=table.copy(industrialtest.ElectricChainsawBase)
+industrialtest.ElectricChainsaw=industrialtest.internal.derive(industrialtest.ElectricChainsawBase,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricChainsaw,{
 	name="industrialtest:electric_chainsaw",
 	description=S("Electric Chainsaw"),
 	inventoryImage="industrialtest_electric_chainsaw.png",
@@ -61,8 +59,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.AdvancedElectricChainsaw=table.copy(industrialtest.ElectricChainsawBase)
+industrialtest.AdvancedElectricChainsaw=industrialtest.internal.derive(industrialtest.ElectricChainsawBase,{
-industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricChainsaw,{
 	name="industrialtest:advanced_electric_chainsaw",
 	description=S("Advanced Electric Chainsaw"),
 	inventoryImage="industrialtest_advanced_electric_chainsaw.png",

tools/electric_drill.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ElectricDrillBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.ElectricDrillBase=industrialtest.internal.derive(industrialtest.ActivatedElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricDrillBase,{
 	digs={
 		"cracky",
 		"crumbly"
@@ -33,8 +32,7 @@ function industrialtest.ElectricDrillBase.getOpPower(self,itemstack)
 	return 50
 end
 
-industrialtest.ElectricDrill=table.copy(industrialtest.ElectricDrillBase)
+industrialtest.ElectricDrill=industrialtest.internal.derive(industrialtest.ElectricDrillBase,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricDrill,{
 	name="industrialtest:electric_drill",
 	description=S("Electric Drill"),
 	inventoryImage="industrialtest_electric_drill.png",
@@ -60,8 +58,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.AdvancedElectricDrill=table.copy(industrialtest.ElectricDrillBase)
+industrialtest.AdvancedElectricDrill=industrialtest.internal.derive(industrialtest.ElectricDrillBase,{
-industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricDrill,{
 	name="industrialtest:advanced_electric_drill",
 	description=S("Advanced Electric Drill"),
 	inventoryImage="industrialtest_advanced_electric_drill.png",

tools/electric_gear_tool.lua

@@ -14,7 +14,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-industrialtest.ElectricGearTool=table.copy(industrialtest.GearTool)
+industrialtest.ElectricGearTool=industrialtest.internal.derive(industrialtest.GearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricGearTool,{
 	prepare=industrialtest.ElectricItem.prepare
 })

tools/electric_hoe.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ElectricHoeBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.ElectricHoeBase=industrialtest.internal.derive(industrialtest.ActivatedElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricHoeBase,{
 	digs={"hoey"},
 	capacity=10000,
 	flow=industrialtest.api.lvPowerFlow
@@ -130,8 +129,7 @@ function industrialtest.ElectricHoeBase.getOpPower(self,itemstack)
 	return 50
 end
 
-industrialtest.ElectricHoe=table.copy(industrialtest.ElectricHoeBase)
+industrialtest.ElectricHoe=industrialtest.internal.derive(industrialtest.ElectricHoeBase,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricHoe,{
 	name="industrialtest:electric_hoe",
 	description=S("Electric Hoe"),
 	inventoryImage="industrialtest_electric_hoe.png",
@@ -164,8 +162,7 @@ minetest.register_craft({
 })
 
 if industrialtest.mclAvailable then
-	industrialtest.AdvancedElectricHoe=table.copy(industrialtest.ElectricHoeBase)
+	industrialtest.AdvancedElectricHoe=industrialtest.internal.derive(industrialtest.ElectricHoeBase,{
-	industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricHoe,{
 		name="industrialtest:advanced_electric_hoe",
 		description=S("Advanced Electric Hoe"),
 		inventoryImage="industrialtest_advanced_electric_hoe.png",

tools/electric_saber.lua

@@ -17,8 +17,7 @@
 -- This entire code is super hacky, I'm aware.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.ElectricSaberBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.ElectricSaberBase=industrialtest.internal.derive(industrialtest.ActivatedElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricSaberBase,{
 	fullPunchInterval=0.5,
 	digs={"snappy"},
 	hits={"fleshy"},
@@ -55,8 +54,7 @@ function industrialtest.ElectricSaberBase.getOpPower(self,itemstack)
 	return 500
 end
 
-industrialtest.ElectricSaber=table.copy(industrialtest.ElectricSaberBase)
+industrialtest.ElectricSaber=industrialtest.internal.derive(industrialtest.ElectricSaberBase,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricSaber,{
 	name="industrialtest:electric_saber",
 	description=S("Electric Saber"),
 	inventoryImage="industrialtest_electric_saber.png",
@@ -81,8 +79,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.AdvancedElectricSaber=table.copy(industrialtest.ElectricSaberBase)
+industrialtest.AdvancedElectricSaber=industrialtest.internal.derive(industrialtest.ElectricSaberBase,{
-industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricSaber,{
 	name="industrialtest:advanced_electric_saber",
 	description=S("Advanced Electric Saber"),
 	inventoryImage="industrialtest_advanced_electric_saber.png",

tools/electric_tool.lua

@@ -14,8 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-industrialtest.ElectricTool=table.copy(industrialtest.Tool)
+industrialtest.ElectricTool=industrialtest.internal.derive(industrialtest.Tool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricTool,{
 	prepare=industrialtest.ElectricItem.prepare
 })
 

tools/fluid_storage.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.FuelCan=table.copy(industrialtest.FluidContainerItem)
+industrialtest.FuelCan=industrialtest.internal.derive(industrialtest.FluidContainerItem,{
-industrialtest.internal.unpackTableInto(industrialtest.FuelCan,{
 	name="industrialtest:fuel_can",
 	description=S("Fuel Can"),
 	inventoryImage="industrialtest_fuel_can.png",

tools/jetpack.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.JetpackBase=table.copy(industrialtest.GearTool)
+industrialtest.JetpackBase=industrialtest.internal.derive(industrialtest.GearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.JetpackBase,{
 	part="torso"
 })
 local soundHandles = {}
@@ -47,8 +46,7 @@ function industrialtest.JetpackBase.update(self, player, inv, itemstack, dtime)
 	return false
 end
 
-industrialtest.Jetpack=table.copy(industrialtest.JetpackBase)
+industrialtest.Jetpack=industrialtest.internal.derive(industrialtest.JetpackBase,{
-industrialtest.internal.unpackTableInto(industrialtest.Jetpack,{
 	-- _v is hack to suppress "Registered armor doesn't have material at the end of registration name" warning from 3D Armor.
 	name="industrialtest:jetpack_v",
 	description=S("Jetpack"),
@@ -84,8 +82,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.ElectricJetpack=table.copy(industrialtest.JetpackBase)
+industrialtest.ElectricJetpack=industrialtest.internal.derive(industrialtest.JetpackBase,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricJetpack,{
 	name="industrialtest:electric_jetpack",
 	description=S("Electric Jetpack"),
 	inventoryImage="industrialtest_electric_jetpack_inv.png",

tools/mining_laser.lua

@@ -108,8 +108,7 @@ minetest.register_entity("industrialtest:mining_laser_beam",{
 	on_step=industrialtest.MiningLaserBeam.onStep
 })
 
-industrialtest.MiningLaser=table.copy(industrialtest.ElectricTool)
+industrialtest.MiningLaser=industrialtest.internal.derive(industrialtest.ElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.MiningLaser,{
 	name="industrialtest:mining_laser",
 	description=S("Mining Laser (Mode 1)"),
 	inventoryImage="industrialtest_mining_laser.png",

tools/nano_suit.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.NanoSuit=table.copy(industrialtest.ElectricArmor)
+industrialtest.NanoSuit=industrialtest.internal.derive(industrialtest.ElectricArmor,{
-industrialtest.internal.unpackTableInto(industrialtest.NanoSuit,{
 	name="industrialtest:nano",
 	elements={
 		{

tools/power_storage.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.REBattery=table.copy(industrialtest.ElectricItem)
+industrialtest.REBattery=industrialtest.internal.derive(industrialtest.ElectricItem,{
-industrialtest.internal.unpackTableInto(industrialtest.REBattery,{
 	name="industrialtest:re_battery",
 	description=S("RE-Battery"),
 	inventoryImage="industrialtest_re_battery.png",
@@ -37,8 +36,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.AdvancedREBattery=table.copy(industrialtest.ElectricItem)
+industrialtest.AdvancedREBattery=industrialtest.internal.derive(industrialtest.ElectricItem,{
-industrialtest.internal.unpackTableInto(industrialtest.AdvancedREBattery,{
 	name="industrialtest:advanced_re_battery",
 	description=S("Advanced RE-Battery"),
 	inventoryImage="industrialtest_advanced_re_battery.png",
@@ -58,8 +56,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.EnergyCrystal=table.copy(industrialtest.ElectricItem)
+industrialtest.EnergyCrystal=industrialtest.internal.derive(industrialtest.ElectricItem,{
-industrialtest.internal.unpackTableInto(industrialtest.EnergyCrystal,{
 	name="industrialtest:energy_crystal",
 	description=S("Energy Crystal"),
 	inventoryImage="industrialtest_energy_crystal.png",
@@ -79,8 +76,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.LapotronCrystal=table.copy(industrialtest.ElectricItem)
+industrialtest.LapotronCrystal=industrialtest.internal.derive(industrialtest.ElectricItem,{
-industrialtest.internal.unpackTableInto(industrialtest.LapotronCrystal,{
 	name="industrialtest:lapotron_crystal",
 	description=S("Lapotron Crystal"),
 	inventoryImage="industrialtest_lapotron_crystal.png",

tools/quantum_suit.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.QuantumArmorBase=table.copy(industrialtest.ElectricGearTool)
+industrialtest.QuantumArmorBase=industrialtest.internal.derive(industrialtest.ElectricGearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.QuantumArmorBase,{
 	flow=industrialtest.api.ivPowerFlow,
 	capacity=10000000
 })
@@ -32,8 +31,7 @@ function industrialtest.QuantumArmorBase.getPowerPerDamageForItem(self,itemstack
 	return 30
 end
 
-industrialtest.QuantumHelmet=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.QuantumHelmet=industrialtest.internal.derive(industrialtest.QuantumArmorBase,{
-industrialtest.internal.unpackTableInto(industrialtest.QuantumHelmet,{
 	name="industrialtest:quantum_helmet",
 	description=S("Quantum Helmet"),
 	inventoryImage="industrialtest_quantum_helmet_inv.png",
@@ -79,8 +77,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.QuantumBodyarmor=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.QuantumBodyarmor=industrialtest.internal.derive(industrialtest.QuantumArmorBase,{
-industrialtest.internal.unpackTableInto(industrialtest.QuantumBodyarmor,{
 	name="industrialtest:quantum_bodyarmor",
 	description=S("Quantum Bodyarmor"),
 	inventoryImage="industrialtest_quantum_bodyarmor_inv.png",
@@ -107,8 +104,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.QuantumLeggings=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.QuantumLeggings=industrialtest.internal.derive(industrialtest.QuantumArmorBase,{
-industrialtest.internal.unpackTableInto(industrialtest.QuantumLeggings,{
 	name="industrialtest:quantum_leggings",
 	description=S("Quantum Leggings"),
 	inventoryImage="industrialtest_quantum_leggings_inv.png",
@@ -167,8 +163,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.QuantumBoots=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.QuantumBoots=industrialtest.internal.derive(industrialtest.QuantumArmorBase,{
-industrialtest.internal.unpackTableInto(industrialtest.QuantumBoots,{
 	name="industrialtest:quantum_boots",
 	description=S("Quantum Boots"),
 	inventoryImage="industrialtest_quantum_boots_inv.png",

tools/scanner.lua

@@ -16,8 +16,7 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.Scanner=table.copy(industrialtest.ElectricTool)
+industrialtest.Scanner=industrialtest.internal.derive(industrialtest.ElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.Scanner,{
 	define={onUse=true}
 })
 
@@ -87,8 +86,7 @@ function industrialtest.OreScanner.isOre(node)
 	return string.find(node.name,":stone_with_")
 end
 
-industrialtest.ODScanner=table.copy(industrialtest.OreScanner)
+industrialtest.ODScanner=industrialtest.internal.derive(industrialtest.OreScanner,{
-industrialtest.internal.unpackTableInto(industrialtest.ODScanner,{
 	name="industrialtest:od_scanner",
 	description=S("OD Scanner"),
 	inventoryImage="industrialtest_od_scanner.png",
@@ -114,8 +112,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.OVScanner=table.copy(industrialtest.OreScanner)
+industrialtest.OVScanner=industrialtest.internal.derive(industrialtest.OreScanner,{
-industrialtest.internal.unpackTableInto(industrialtest.OVScanner,{
 	name="industrialtest:ov_scanner",
 	description=S("OV Scanner"),
 	inventoryImage="industrialtest_ov_scanner.png",

tools/solar_helmet.lua

@@ -15,8 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.SolarHelmet=table.copy(industrialtest.GearTool)
+industrialtest.SolarHelmet=industrialtest.internal.derive(industrialtest.GearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.SolarHelmet,{
 	name="industrialtest:solar_helmet",
 	description=S("Solar Helmet"),
 	inventoryImage="industrialtest_solar_helmet_inv.png",

tools/static_boots.lua

@@ -15,11 +15,9 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.StaticBoots=table.copy(industrialtest.GearTool)
 
 local image=(industrialtest.mtgAvailable and "industrialtest_static_boots.png" or "industrialtest_mcl_static_boots.png")
-
+industrialtest.StaticBoots=industrialtest.internal.derive(industrialtest.GearTool,{
-industrialtest.internal.unpackTableInto(industrialtest.StaticBoots,{
 	name="industrialtest:static_boots",
 	description=S("Static Boots"),
 	inventoryImage="industrialtest_static_boots_inv.png",

tools/tool.lua

@@ -14,8 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-industrialtest.Tool=table.copy(industrialtest.Item)
+industrialtest.Tool=industrialtest.internal.derive(industrialtest.Item,{
-industrialtest.internal.unpackTableInto(industrialtest.Tool,{
 	define={}
 })
 

tools/treetap.lua

@@ -38,8 +38,7 @@ local function onTreetapUse(user,pointed)
 end
 
 local S=minetest.get_translator("industrialtest")
-industrialtest.Treetap=table.copy(industrialtest.Tool)
+industrialtest.Treetap=industrialtest.internal.derive(industrialtest.Tool,{
-industrialtest.internal.unpackTableInto(industrialtest.Treetap,{
 	name="industrialtest:treetap",
 	define={onPlace=true},
 	description=S("Treetap"),
@@ -65,8 +64,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.ElectricTreetap=table.copy(industrialtest.ElectricTool)
+industrialtest.ElectricTreetap=industrialtest.internal.derive(industrialtest.ElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricTreetap,{
 	name="industrialtest:electric_treetap",
 	define={onPlace=true},
 	description=S("Electric Treetap"),

tools/wrench.lua

@@ -40,8 +40,7 @@ local function onWrenchUse(user,pointed)
 	return true
 end
 
-industrialtest.Wrench=table.copy(industrialtest.Tool)
+industrialtest.Wrench=industrialtest.internal.derive(industrialtest.Tool,{
-industrialtest.internal.unpackTableInto(industrialtest.Wrench,{
 	name="industrialtest:wrench",
 	define={onUse=true},
 	description=S("Wrench"),
@@ -66,8 +65,7 @@ minetest.register_craft({
 	}
 })
 
-industrialtest.ElectricWrench=table.copy(industrialtest.ElectricTool)
+industrialtest.ElectricWrench=industrialtest.internal.derive(industrialtest.ElectricTool,{
-industrialtest.internal.unpackTableInto(industrialtest.ElectricWrench,{
 	name="industrialtest:electric_wrench",
 	define={onUse=true},
 	description=S("Electric Wrench"),