Migrate to 2.1 api

.vscode/settings.json

@@ -23,7 +23,7 @@
         "settings",
         "rcon",
         "rendering",
-        "global",
+        "storage",
         "log",
         "defines",
         "serpent",

control.lua

@@ -21,26 +21,26 @@ remote.add_interface("loader-redux",  {
   -- add loader name if it doesn't already exist
   add_loader = function(name)
     if name then
-      global.supported_loaders = global.supported_loaders or {} -- allows on_init of API subscribers be called before on_configuration_changed resets everything
-      global.supported_loaders[name] = true
-      global.supported_loader_names = {}
-      for k, v in pairs(global.supported_loaders) do
-        table.insert(global.supported_loader_names, k)
+      storage.supported_loaders = storage.supported_loaders or {} -- allows on_init of API subscribers be called before on_configuration_changed resets everything
+      storage.supported_loaders[name] = true
+      storage.supported_loader_names = {}
+      for k, v in pairs(storage.supported_loaders) do
+        table.insert(storage.supported_loader_names, k)
       end
-      log("global.supported_loaders: "..serpent.block(global.supported_loaders) )
+      log("storage.supported_loaders: "..serpent.block(storage.supported_loaders) )
     end
   end,
 
   -- remove loader name
   remove_loader = function(name)
     if name then
-      global.supported_loaders = global.supported_loaders or {} -- allows on_init of API subscribers be called before on_configuration_changed resets everything
-      global.supported_loaders[name] = nil
-      global.supported_loader_names = {}
-      for k, v in pairs(global.supported_loaders) do
-        table.insert(global.supported_loader_names, k)
+      storage.supported_loaders = storage.supported_loaders or {} -- allows on_init of API subscribers be called before on_configuration_changed resets everything
+      storage.supported_loaders[name] = nil
+      storage.supported_loader_names = {}
+      for k, v in pairs(storage.supported_loaders) do
+        table.insert(storage.supported_loader_names, k)
       end
-      log("global.supported_loaders: "..serpent.block(global.supported_loaders) )
+      log("storage.supported_loaders: "..serpent.block(storage.supported_loaders) )
     end
   end
 })
@@ -54,8 +54,8 @@ end)
 
 --Snap loaders on built or correct existing loaders when building next to them.
 script.on_event({defines.events.on_built_entity, defines.events.on_robot_built_entity}, function(event)
-  local entity = event.created_entity
-  if entity.type == "loader" and global.supported_loaders[entity.name] then
+  local entity = event.entity
+  if entity.type == "loader" and storage.supported_loaders[entity.name] then
     if use_snapping then
       snapping.snap_loader(entity, event)
     end
@@ -76,7 +76,7 @@ end)
 ---- Bootstrap ----
 
 function init_supported_loaders()
-  global.supported_loaders = {} -- clean old prototype names, API subscribers should be called afterwards
+  storage.supported_loaders = {} -- clean old prototype names, API subscribers should be called afterwards
   remote.call("loader-redux", "add_loader", "loader")
   remote.call("loader-redux", "add_loader", "fast-loader")
   remote.call("loader-redux", "add_loader", "express-loader")
@@ -91,6 +91,6 @@ end)
 script.on_configuration_changed(function(data)
   init_supported_loaders()
   -- wipe unused globals
-  global.wagons = nil
-  global.loader_wagon_map = nil
+  storage.wagons = nil
+  storage.loader_wagon_map = nil
 end)

info.json

@@ -1,11 +1,11 @@
 {
   "name": "LoaderRedux",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "title": "Loader Redux",
   "author": "Optera",
   "contact": "https://forums.factorio.com/memberlist.php?mode=viewprofile&u=21729",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=97&t=48412",
   "description": "Adds Loaders capable of snapping to belts. Graphics from Arch666Angel and Kirazy.",
-  "factorio_version": "1.1",
-  "dependencies": ["base >= 1.1.75", "flib >= 0.6.0"]
+  "factorio_version": "2.1",
+  "dependencies": ["base >= 2.0.0", "flib >= 0.6.0"]
 }