From 6481cf9755e4dae91f2961089b5784e48d216a57 Mon Sep 17 00:00:00 2001
From: Kevin Taylor <kevin@okiedokie.co.uk>
Date: Sun, 17 May 2020 11:24:13 +0100
Subject: [PATCH] Added toolbar aliases, Save as LUA table

---
 config/preset_player_quickbar.lua |  2 +-
 modules/commands/quickbar.lua     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/preset_player_quickbar.lua b/config/preset_player_quickbar.lua
index 079ccd87..fb3ad815 100644
--- a/config/preset_player_quickbar.lua
+++ b/config/preset_player_quickbar.lua
@@ -2,5 +2,5 @@
 -- @config Preset-Player-Quickbar
 
 return {
-	dangerarea={'transport-belt','fast-transport-belt'}
+	dangerarea={"transport-belt",[2]="fast-transport-belt","express-transport-belt",[11]="transport-belt",[23]="fast-transport-belt",[33]="express-transport-belt"}
 }
diff --git a/modules/commands/quickbar.lua b/modules/commands/quickbar.lua
index 8c64f3aa..2a8e1cf8 100644
--- a/modules/commands/quickbar.lua
+++ b/modules/commands/quickbar.lua
@@ -13,12 +13,13 @@ local config = require 'config.preset_player_quickbar' --- @dep config.preset_pl
 --- Loads your quickbar preset
 -- @command load-quickbar
 Commands.new_command('load-quickbar','Loads your preset Quickbar items')
+:add_alias('load-toolbar')
 :register(function(player)
     if config[player.name] then
         local custom_quickbar = config[player.name]
         for i, item_name in pairs(custom_quickbar) do
           if item_name ~= nil and item_name ~= '' then
-            player.set_quick_bar_slot(i, item_name)
+              player.set_quick_bar_slot(i, item_name)
           end
         end
     else
@@ -29,16 +30,15 @@ end)
 --- Saves your quickbar preset to the script-output folder
 -- @command save-quickbar
 Commands.new_command('save-quickbar','Saves your Quickbar preset items to file')
+:add_alias('save-toolbar')
 :register(function(player)
     local quickbar_names = {}
     for i=1, 100 do
         local slot = player.get_quick_bar_slot(i)
         if slot ~= nil then
-            table.insert(quickbar_names, slot.name)
-        else
-            table.insert(quickbar_names, "")
+            table.insert(quickbar_names, i, slot.name)
         end
     end
-    game.write_file("quickbar_preset.txt", game.table_to_json(quickbar_names), false)
-    Commands.print("Quickbar saved to local script-output folder")
+    game.write_file("quickbar_preset.txt", player.name .. " = " .. serpent.line(quickbar_names) .. "\n", true)
+    Commands.print("Quickbar saved")
 end)