compat/pipeworks.lua

@@ -41,10 +41,7 @@ local function addPipeworksCompatibility(name,sides,inputInventory)
 					return nil
 				end
 				local result=inv:add_item(listname,stack)
-				local def=minetest.registered_nodes[node.name]
-				if def and def._industrialtest_self then
-					def._industrialtest_self:triggerIfNeeded(pos)
-				end
+				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 				return result
 			end,
 			can_insert=function(pos,node,stack,direction)
@@ -56,16 +53,6 @@ local function addPipeworksCompatibility(name,sides,inputInventory)
 				end
 				return inv:room_for_item(listname,stack)
 			end,
-			remove_items=function(pos,node,stack,direction,count,listname)
-				local meta=minetest.get_meta(pos)
-				local inv=meta:get_inventory()
-				inv:remove_item(listname,stack)
-				local def=minetest.registered_nodes[node.name]
-				if def and def._industrialtest_self then
-					def._industrialtest_self:triggerIfNeeded(pos)
-				end
-				return stack
-			end,
 			input_inventory=inputInventory,
 			connect_sides={
 				left=1,
@@ -170,8 +157,7 @@ local override={
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			local result=inv:add_item(listname,stack)
-			industrialtest.Reactor.synchronizeChambers(pos)
-			industrialtest.Reactor:triggerIfNeeded(pos)
+			minetest.registered_nodes["industrialtest:nuclear_reactor"].on_metadata_inventory_put(pos)
 			return result
 		end,
 		can_insert=function(pos,node,stack,direction)
@@ -185,14 +171,6 @@ local override={
 			local inv=meta:get_inventory()
 			return inv:room_for_item(listname,stack)
 		end,
-		remove_items=function(pos,node,stack,direction,count,listname)
-			local meta=minetest.get_meta(pos)
-			local inv=meta:get_inventory()
-			inv:remove_item(listname,stack)
-			industrialtest.Reactor.synchronizeChambers(pos)
-			industrialtest.Reactor:triggerIfNeeded(pos)
-			return stack
-		end,
 		input_inventory="fuel",
 		connect_sides={
 			left=1,
@@ -229,22 +207,10 @@ override.tube.insert_object=function(pos,node,stack,direction)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local result=inv:add_item(listname,stack)
-	industrialtest.Reactor:synchronizeToChamber(pos)
-	local reactorPos=minetest.deserialize(meta:get_string("reactor"))
-	industrialtest.Reactor:triggerIfNeeded(reactorPos)
+	minetest.registered_nodes["industrialtest:nuclear_reactor_chamber"].on_metadata_inventory_put(pos)
 	return result
 end
 
-override.tube.remove_items=function(pos,node,stack,direction,count,listname)
-	local meta=minetest.get_meta(pos)
-	local inv=meta:get_inventory()
-	inv:remove_item(listname,stack)
-	industrialtest.Reactor:synchronizeToChamber(pos)
-	local reactorPos=minetest.deserialize(meta:get_string("reactor"))
-	industrialtest.Reactor:triggerIfNeeded(reactorPos)
-	return stack
-end
-
 override.after_place_node_old=def.after_place_node
 override.after_place_node=function(pos)
 	minetest.registered_nodes["industrialtest:nuclear_reactor_chamber"].after_place_node_old(pos)
@@ -303,14 +269,14 @@ override={
 			if direction.y==1 then
 				listname="powerStorage"
 			elseif direction.y==-1 then
-				listname="src"
+				listname="fuel"
 			else
-				listname="dst"
+				listname="target"
 			end
 			local def=stack:get_definition()
 			if (listname=="powerStorage" and not industrialtest.api.hasPowerStorage(stack:get_meta())) or
-				(listname=="src" and (not def.groups or not def.groups._industrialtest_fuel)) or
-				(listname=="dst" and (not def.groups or not def.groups._industrialtest_fueled)) then
+				(listname=="fuel" and (not def.groups or not def.groups._industrialtest_fuel)) or
+				(listname=="target" and (not def.groups or not def.groups._industrialtest_fueled)) then
 				return nil
 			end
 			local meta=minetest.get_meta(pos)
@@ -324,28 +290,21 @@ override={
 			if direction.y==1 then
 				listname="powerStorage"
 			elseif direction.y==-1 then
-				listname="src"
+				listname="fuel"
 			else
-				listname="dst"
+				listname="target"
 			end
 			local def=stack:get_definition()
 			if (listname=="powerStorage" and not industrialtest.api.hasPowerStorage(stack:get_meta())) or
-				(listname=="src" and (not def.groups or not def.groups._industrialtest_fuel)) or
-				(listname=="dst" and (not def.groups or not def.groups._industrialtest_fueled)) then
+				(listname=="fuel" and (not def.groups or not def.groups._industrialtest_fuel)) or
+				(listname=="target" and (not def.groups or not def.groups._industrialtest_fueled)) then
 				return false
 			end
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			return inv:room_for_item(listname,stack)
 		end,
-		remove_items=function(pos,node,stack,direction,count,listname)
-			local meta=minetest.get_meta(pos)
-			local inv=meta:get_inventory()
-			inv:remove_item(listname,stack)
-			industrialtest.CanningMachine:triggerIfNeeded(pos)
-			return stack
-		end,
-		input_inventory="dst",
+		input_inventory="target",
 		connect_sides={
 			left=1,
 			right=1,

machines/canning_machine.lua

@@ -99,7 +99,7 @@ function industrialtest.CanningMachine.getFormspec(self,pos)
 	return parentFormspec..table.concat(formspec,"")
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count)
 	if toList=="src" then
 		local inv=minetest.get_meta(pos):get_inventory()
 		local itemstack=inv:get_stack(fromList,fromIndex)
@@ -112,13 +112,10 @@ function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromL
 		local def=itemstack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and count or 0
 	end
-	if toList=="leftover" then
-		return 0
-	end
-	return math.min(count,industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count))
+	return math.min(count,industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count))
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
+function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="src" then
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fuel) and stack:get_count() or 0
@@ -127,13 +124,10 @@ function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listna
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and stack:get_count() or 0
 	end
-	if listname=="leftover" then
-		return 0
-	end
-	return math.min(stack:get_count(),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player))
+	return math.min(stack:get_count(),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack))
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listname,index,stack,player)
+function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
@@ -142,7 +136,7 @@ function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listn
 		meta:set_float("srcTime",0)
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
-	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryTake(self,pos,listname,index,stack,player)
+	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 end
 
 function industrialtest.CanningMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
@@ -157,7 +151,7 @@ function industrialtest.CanningMachine.onMetadataInventoryMove(self,pos,fromList
 	end
 end
 
-function industrialtest.CanningMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
+function industrialtest.CanningMachine.onMetadataInventoryPut(self,pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end