1.6.0 (#4)

- updated to Factorio 0.16

Author: 0ptera

changelog.txt

@@ -1,3 +1,6 @@
+1.6.0
+- updated to Factorio 0.16
+
 1.5.4
 - fixed inventory contents not showing in 1.5.3 
 

control.lua

@@ -76,15 +76,15 @@ function OnEntityCreated(event)
 
 		if #global.ItemSensors == 1 then
 			script.on_event(defines.events.on_tick, OnTick)
-			script.on_event({defines.events.on_preplayer_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, OnEntityRemoved)
+			script.on_event({defines.events.on_pre_player_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, OnEntityRemoved)
 		end
 
     ResetStride()
 	end
 end
 
 function OnEntityRemoved(event)
--- script.on_event({defines.events.on_preplayer_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, function(event)
+-- script.on_event({defines.events.on_pre_player_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, function(event)
 	if event.entity.name == SENSOR then
     for i=#global.ItemSensors, 1, -1 do
       if event.entity.unit_number == global.ItemSensors[i].ID then
@@ -94,7 +94,7 @@ function OnEntityRemoved(event)
 
 		if #global.ItemSensors == 0 then
 			script.on_event(defines.events.on_tick, nil)
-			script.on_event({defines.events.on_preplayer_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, nil)
+			script.on_event({defines.events.on_pre_player_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, nil)
 		end
 
     ResetStride()
@@ -326,7 +326,7 @@ function UpdateSensor(itemSensor)
 	for i=1, #connectedEntity.fluidbox, 1 do
 		local fluid = connectedEntity.fluidbox[i]
 		if fluid then
-			signals[signalIndex] = {index = signalIndex, signal = {type = "fluid",name = fluid.type},count = ceil(fluid.amount) }
+			signals[signalIndex] = {index = signalIndex, signal = {type = "fluid",name = fluid.name},count = ceil(fluid.amount) }
 			signalIndex = signalIndex+1
 		end
 	end
@@ -350,7 +350,7 @@ local function init_events()
 	script.on_event({defines.events.on_built_entity, defines.events.on_robot_built_entity}, OnEntityCreated)
 	if global.ItemSensors and #global.ItemSensors > 0 then
 		script.on_event(defines.events.on_tick, OnTick)
-		script.on_event({defines.events.on_preplayer_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, OnEntityRemoved)
+		script.on_event({defines.events.on_pre_player_mined_item, defines.events.on_robot_pre_mined, defines.events.on_entity_died}, OnEntityRemoved)
 	end
 end
 

info.json

@@ -1,11 +1,11 @@
 {
   "name": "Inventory Sensor",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "title": "Inventory Sensor",
   "author": "Optera",
   "contact": "https://forums.factorio.com/memberlist.php?mode=viewprofile&u=21729",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=97&t=30454",
   "description": "Adds a combinator that reads inventories of locomotives, wagons, cars, furnaces, assemblers, roboports, rocket silos and reactors.",
-  "factorio_version": "0.15",
-	"dependencies": ["base >= 0.15.37"]
+  "factorio_version": "0.16",
+	"dependencies": ["base >= 0.16.0"]
 }

prototypes/entity.lua

@@ -1,163 +1,53 @@
-data:extend({
+local inv_sensor = table.deepcopy(data.raw["constant-combinator"]["constant-combinator"])
+inv_sensor.name = "item-sensor"
+inv_sensor.icon = "__Inventory Sensor__/graphics/icons/inventory-sensor.png"
+inv_sensor.icon_size = 32
+inv_sensor.minable.result = "item-sensor"
+
+inv_sensor.sprites =
+{
+  north =
   {
-    type = "constant-combinator",
-    name = "item-sensor",
-    icon = "__Inventory Sensor__/graphics/icons/inventory-sensor.png",
-    flags = {"placeable-neutral", "player-creation"},
-    minable = {hardness = 0.2, mining_time = 0.5, result = "item-sensor"},
-    max_health = 50,
-    corpse = "small-remnants",
-
-    collision_box = {{-0.35, -0.35}, {0.35, 0.35}},
-    selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
-
-    item_slot_count = 1000,
-
-    sprites =
-    {
-      north =
-      {
-        filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
-        x = 158,
-        y = 5,
-        width = 79,
-        height = 63,
-        frame_count = 1,
-        shift = {0.140625, 0.140625},
-      },
-      east =
-      {
-        filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
-        y = 5,
-        width = 79,
-        height = 63,
-        frame_count = 1,
-        shift = {0.140625, 0.140625},
-      },
-      south =
-      {
-        filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
-        x = 237,
-        y = 5,
-        width = 79,
-        height = 63,
-        frame_count = 1,
-        shift = {0.140625, 0.140625},
-      },
-      west =
-      {
-        filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
-        x = 79,
-        y = 5,
-        width = 79,
-        height = 63,
-        frame_count = 1,
-        shift = {0.140625, 0.140625},
-      }
-    },
-
-    activity_led_sprites =
-    {
-      north =
-      {
-        filename = "__base__/graphics/entity/combinator/activity-leds/combinator-led-constant-north.png",
-        width = 11,
-        height = 10,
-        frame_count = 1,
-        shift = {0.296875, -0.40625},
-      },
-      east =
-      {
-        filename = "__base__/graphics/entity/combinator/activity-leds/combinator-led-constant-east.png",
-        width = 14,
-        height = 12,
-        frame_count = 1,
-        shift = {0.25, -0.03125},
-      },
-      south =
-      {
-        filename = "__base__/graphics/entity/combinator/activity-leds/combinator-led-constant-south.png",
-        width = 11,
-        height = 11,
-        frame_count = 1,
-        shift = {-0.296875, -0.078125},
-      },
-      west =
-      {
-        filename = "__base__/graphics/entity/combinator/activity-leds/combinator-led-constant-west.png",
-        width = 12,
-        height = 12,
-        frame_count = 1,
-        shift = {-0.21875, -0.46875},
-      }
-    },
-
-    activity_led_light =
-    {
-      intensity = 0.8,
-      size = 1,
-    },
-
-    activity_led_light_offsets =
-    {
-      {0.296875, -0.40625},
-      {0.25, -0.03125},
-      {-0.296875, -0.078125},
-      {-0.21875, -0.46875}
-    },
-
-    circuit_wire_connection_points =
-    {
-      {
-        shadow =
-        {
-          red = {0.15625, -0.28125},
-          green = {0.65625, -0.25}
-        },
-        wire =
-        {
-          red = {-0.28125, -0.5625},
-          green = {0.21875, -0.5625},
-        }
-      },
-      {
-        shadow =
-        {
-          red = {0.75, -0.15625},
-          green = {0.75, 0.25},
-        },
-        wire =
-        {
-          red = {0.46875, -0.5},
-          green = {0.46875, -0.09375},
-        }
-      },
-      {
-        shadow =
-        {
-          red = {0.75, 0.5625},
-          green = {0.21875, 0.5625}
-        },
-        wire =
-        {
-          red = {0.28125, 0.15625},
-          green = {-0.21875, 0.15625}
-        }
-      },
-      {
-        shadow =
-        {
-          red = {-0.03125, 0.28125},
-          green = {-0.03125, -0.125},
-        },
-        wire =
-        {
-          red = {-0.46875, 0},
-          green = {-0.46875, -0.40625},
-        }
-      }
-    },
-
-    circuit_wire_max_distance = 7.5
+    filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
+    x = 158,
+    y = 5,
+    width = 79,
+    height = 63,
+    frame_count = 1,
+    shift = {0.140625, 0.140625},
+  },
+  east =
+  {
+    filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
+    y = 5,
+    width = 79,
+    height = 63,
+    frame_count = 1,
+    shift = {0.140625, 0.140625},
+  },
+  south =
+  {
+    filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
+    x = 237,
+    y = 5,
+    width = 79,
+    height = 63,
+    frame_count = 1,
+    shift = {0.140625, 0.140625},
+  },
+  west =
+  {
+    filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
+    x = 79,
+    y = 5,
+    width = 79,
+    height = 63,
+    frame_count = 1,
+    shift = {0.140625, 0.140625},
   }
-})
+}
+
+inv_sensor.item_slot_count = 1000
+    
+    
+data:extend({ inv_sensor })

prototypes/item.lua

@@ -3,6 +3,7 @@ data:extend({
     type = "item",
     name = "item-sensor",
     icon = "__Inventory Sensor__/graphics/icons/inventory-sensor.png",
+    icon_size = 32,
     flags = { "goes-to-quickbar" },
     subgroup = "circuit-network",
     place_result="item-sensor",

prototypes/recipe.lua

@@ -3,6 +3,7 @@ data:extend({
     type = "recipe",
     name = "item-sensor",
     icon = "__Inventory Sensor__/graphics/icons/inventory-sensor.png",
+    icon_size = 32,
     enabled = "false",
     ingredients =
     {

prototypes/signal.lua

@@ -10,41 +10,47 @@ data:extend({
     type = "virtual-signal",
     name = "inv-sensor-progress",
     icon = "__Inventory Sensor__/graphics/icons/progress.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-ba"
   },
   {
     type = "virtual-signal",
     name = "inv-sensor-temperature",
     icon = "__Inventory Sensor__/graphics/icons/temperature.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-bb"
   },
   {
     type = "virtual-signal",
     name = "inv-sensor-detected-car",
     icon = "__Inventory Sensor__/graphics/icons/car.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-da"
   },
   {
     type = "virtual-signal",
     name = "inv-sensor-detected-tank",
     icon = "__Inventory Sensor__/graphics/icons/tank.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-db"
   },
   {
     type = "virtual-signal",
     name = "inv-sensor-detected-wagon",
     icon = "__base__/graphics/icons/cargo-wagon.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-dd"
   },
   {
     type = "virtual-signal",
     name = "inv-sensor-detected-locomotive",
     icon = "__base__/graphics/icons/diesel-locomotive.png",
+    icon_size = 32,
     subgroup = "sensor-signals",
     order = "x[sensor-signals]-dc"
   }