0.9.0 update

judos · Dec 10, 2021 · 698dffb · 698dffb
2 parents 5a0eb2b + 4a44c90
commit 698dffb
Show file tree

Hide file tree

Showing 81 changed files with 1,193 additions and 1,062 deletions.
diff --git a/source/changelog.txt b/source/changelog.txt
@@ -1,56 +1,102 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.9.0
+Date: 2021-12-10
+  Info:
+    - Update by snouz
+  Visuals:
+    - New entity graphics (less flat, better colors, doesn't go over items, cleaner, repositioned).
+    - Off belt sorter has its led turned off.
+    - New hd icons.
+    - New hd techs.
+    - Adjusted position of wires.
+    - New mod icon.
+  Changes:
+    - Belt sorter technologies are now dependant on their logistics technology counterparts.
+    - "Everything else" filter is now in "Unsorted" tab.
+    - Belt sorters are now with belts in the GUI.
+    - Updated French locale.
+  Bugfixes:
+    - Fixed crash when bots build a sorter (still doesn't copy the config though)
+    - Fixed that config entity was blueprintable.
+  Compatibility:
+    - Added separate technologies for Belt Sorter 4 & 5 (when mods add those tiers) and added custom prerequisites per mod.
+    - Added compatibility with Krastorio 2.
+    - Added compatibility with Mod Mash: Logistics.
+    - Added compatibility with 5Dim: New Transport.
+    - Added compatibility with One More Tier.
+    - Added compatibility with Better Belts.
+    - Added compatibility with Factorio Extended: Transport.
+    - Added compatibility with Factorio Extended Plus: Transport.
+    - Added compatibility with Iper Belt.
+    - Added compatibility with Hiladdar's Belts.
+    - Bob's Logistics: Item/recipe moved in GUI.
+    - Fixed crash with 5Dim: New Energy
+  Optimization:
+    - Code refactorisation.
+    - PNG size optimized.
+---------------------------------------------------------------------------------------------------
+Version: 0.8.0
+Date: 2020-12-12
+  Changes:
+    - Updated to work with Factorio 1.1 (ALPHA RELEASE)
+---------------------------------------------------------------------------------------------------
+Version: 0.7.1
+Date: 2020-12-12
+  Changes:
+    - Updated prerequisites to tier 3 to require the production science pack technology to be researched.
+---------------------------------------------------------------------------------------------------
 Version: 0.7.0
-Date: 2.Feb 2020
+Date: 2020-03-26
   Changes:
     - Updated for Factorio 0.18
     - Updated Russian locales (thanks to traiben on GitHub)
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.4
-Date: 1.Sep 2019
+Date: 2019-09-01
   Changes:
     - Add startup setting such that beltSorters don't need energy (default off)
     - Fix integration issue (support for warptorio)
     - Add option to use beltSorters as splitter (distribution is not perfectly balanced but randomized)
 ---------------------------------------------------------------------------------------------------
 Version 0.6.3
-Date: 3.Jul 2019
+Date: 2019-07-03
   Changes:
     - Fix beltSorters didn't use any energy at all (except if condition is set), did you actually notice this earlier? :D
     - Above also fixes an issue with Realistic Power mod making beltSorters not work in general
     - Add support for krastorio, advanced-logistics unlocks Turbo BeltSorter
 ---------------------------------------------------------------------------------------------------
 Version 0.6.2
-Date: 1.Jul 2019
+Date: 2019-07-01
   Changes:
     - Fix update speed to match new speed of belts (factorio 0.17)
     - Add Turbo and Ultimate BeltSorter with speed of 60-75 Items/s
     - Add migration such that bobs' logistics-4 and ultimateBelts' ultra fast logistics unlock these beltSorter
 ---------------------------------------------------------------------------------------------------
 Version 0.6.1
-Date: 28.Jun 2019
+Date: 2019-06-28
   Changes:
     - Add thumbnail for the beautiful mod portal
     - Fix priority button width for belt-sorter-3, add label for translation "Make this priority __1__"
     - Add support for 1x1 sized loader type entities (credits to shanemadden for the change)
       -> Note: the speed is halfed because loaders only have half a belt, and the beltSorter usually waits for a belt to have filled before transfering items.
 ---------------------------------------------------------------------------------------------------
 Version 0.6.0
-Date: 9.Mar 2019
+Date: 2019-03-09
   Changes:
     - Updated to work with Factorio 0.17.x
 ---------------------------------------------------------------------------------------------------
 Version 0.5.4
-Date: 26.Dec 2017
+Date: 2017-12-26
   Changes:
     - fix entity system crash when beltSorter is removed.
 ---------------------------------------------------------------------------------------------------
 Version 0.5.3
-Date: 26.Dec 2017
+Date: 2017-12-26
   Changes:
     - add russian locale thanks to ProShow
 ---------------------------------------------------------------------------------------------------
 Version 0.5.2
-Date: 26.Dec 2017
+Date: 2017-12-26
   Changes:
     - add beltSorter support to pickerDolly (let's you move beltSorters around. See PickerExtended Mod)
     - improved player logging of errors
@@ -63,13 +109,13 @@ Date: 26.Dec 2017
     - fix no energy symbol blinking in low energy setups in 0.16
 ---------------------------------------------------------------------------------------------------
 Version 0.4.1
-Date: 8.Jun 2017
+Date: 2017-06-08
   Changes:
     - fix migration for items which don't exist anymore
     - fix migration problem printed for all beltSorters, even if there was no problem
 ---------------------------------------------------------------------------------------------------
 Version 0.4.0
-Date: 6.Jun 2017
+Date: 2017-06-06
   Changes:
     - there are now 3 tiers of beltSorter: basic, average and advanced
     - basic belt sorter only allows setting 2 filter slots, average 3, advanced 4.
@@ -83,30 +129,30 @@ Date: 6.Jun 2017
     - refactored control logic of beltSorters, all beltSorters use now the same distribution logic
 ---------------------------------------------------------------------------------------------------
 Version 0.3.6
-Date: 6.May 2017
+Date: 2017-05-06
   Changes:
     - migrate to support factorio 0.15.9
 ---------------------------------------------------------------------------------------------------
 Version 0.3.4
-Date: 18.Nov 2016
+Date: 2016-11-18
   Changes:
     - fix config not copied in blueprint when blueprint is rotated
     - fix config not loaded when advanced beltsorter is built by blueprint
     - fix potential crash in item selection gui
     - Recipe is a LOT cheaper now - adapted to the much more powerful inserters since factorio 0.14
 ---------------------------------------------------------------------------------------------------
 Version 0.3.3
-Date: 29.Sep 2016
+Date: 2016-09-29
   Changes:
     - fix crash when selecting belt side on advanced sorter before an item was selected in any slot.
 ---------------------------------------------------------------------------------------------------
 Version 0.3.2
-Date: 20.Sep 2016
+Date: 2016-09-20
   Changes:
     - Fix name collision problem with caused crash with other mods. (Thanks to Lappro)
 ---------------------------------------------------------------------------------------------------
 Version 0.3.1
-Date: 18.Sep 2016
+Date: 2016-09-18
   Changes:
     - added advanced belt-sorter
     - new tech for advanced-belt-sorter
@@ -117,21 +163,21 @@ Date: 18.Sep 2016
     - added small description to belt-sorter guis
 ---------------------------------------------------------------------------------------------------
 Version 0.3.0
-Date: 11.Sep 2016
+Date: 2016-09-11
   Changes:
     - support factorio 0.14
     - hide filter item from default factorio item selection gui
     - hide other hidden items from the beltSorter item selection gui
     - item Selection list in beltSorter is now scrollable
 ---------------------------------------------------------------------------------------------------
 Version 0.2.2
-Date: 17.Oct 2016
+Date: 2016-08-17
   Changes:
     - entity system works for multiple surfaces
     - add filter item to sort out all other items
 ---------------------------------------------------------------------------------------------------
 Version 0.2.1
-Date: 5.Aug 2016
+Date: 2016-08-05
   Changes:
     - new graphics for belt Sorter (thanks to Arch666Angel)
   Fixes:
@@ -140,7 +186,7 @@ Date: 5.Aug 2016
     - added missing locale messages (just in english) (Thanks to vitorboschi)
 ---------------------------------------------------------------------------------------------------
 Version 0.2.0
-Date: 5.Aug 2016
+Date: 2016-08-05
   Changes:
     - Split off mod from hardCrafting. For factorio 0.13.0
     - define 4 items as filter for each direction

diff --git a/source/constants.lua b/source/constants.lua
@@ -1,9 +1,8 @@
-
-modVersion = "0.6.0" --version of control data, only updated when control.lua data handling changes in a major way
+modVersion = "0.8.1" --version of control data, only updated when control.lua data handling changes in a major way
 modName = "beltSorter" -- required prefix for all ui name components which can be clicked
 fullModName = "beltSorter" -- required for logging and prototypes
 
 
 logging.debug_master = true
 --logging.testing = true -- enables player printing of every log, sets log level to info
---logging.debug_level = 1  -- 1=info 2=warn 3=error
+--logging.debug_level = 1  -- 1=info 2=warn 3=error
diff --git a/source/control.lua b/source/control.lua
@@ -1,12 +1,11 @@
+require("libs.all")
+require("libs.prototypes.all")
+require("libs.control.functions")
 
-require "libs.all"
-require "libs.prototypes.all"
-require "libs.control.functions"
+require("constants")
 
-require "constants"
-
-require "control.belt-sorter"
-require "control.belt-sorter-config"
+require("control.belt-sorter")
+require("control.belt-sorter-config")
 
 -- global data used:
 -- beltSorter.version = $version
@@ -16,25 +15,25 @@ require "control.belt-sorter-config"
 ---------------------------------------------------
 
 local function migration()
-	local bs = global.beltSorter
-	local previousVersion = bs.version
-	--info("Previous version: "..previousVersion)
-	if bs.version ~= previousVersion then
-		info("Previous version: "..previousVersion.." migrated to "..bs.version)
-	end
+  local bs = global.beltSorter
+  local previousVersion = bs.version
+  --info("Previous version: "..previousVersion)
+  if bs.version ~= previousVersion then
+    info("Previous version: "..previousVersion.." migrated to "..bs.version)
+  end
 end
 
 local function init()
-	if not global.beltSorter then global.beltSorter = {} end
-	local bs = global.beltSorter
-	if not bs.version then bs.version = modVersion end
-	entities_init()
-	gui_init()
-	migration()
+  if not global.beltSorter then global.beltSorter = {} end
+  local bs = global.beltSorter
+  if not bs.version then bs.version = modVersion end
+  entities_init()
+  gui_init()
+  migration()
 end
 
 local function onLoad()
-	entities_load()
+  entities_load()
 end
 
 script.on_init(init)
@@ -45,45 +44,44 @@ script.on_load(onLoad)
 -- Tick
 ---------------------------------------------------
 script.on_event(defines.events.on_tick, function(event)
-	entities_tick()
-	gui_tick()
+  entities_tick()
+  gui_tick()
 end)
 
 ---------------------------------------------------
 -- Building Entities
 ---------------------------------------------------
 script.on_event({defines.events.on_built_entity,
-                 defines.events.on_robot_built_entity, 
+                 defines.events.on_robot_built_entity,
                  defines.events.script_raised_built,
                  defines.events.script_raised_revive}, function(event)
-	entities_build(event)
+  entities_build(event)
 end)
 
 script.on_event(defines.events.on_entity_cloned, function(event)
-	event.created_entity=event.destination
-	entities_build(event)
+  event.created_entity=event.destination
+  entities_build(event)
 end)
 
 ---------------------------------------------------
 -- Removing entities
 ---------------------------------------------------
 script.on_event(defines.events.on_robot_pre_mined, function(event)
-	entities_pre_mined(event)
+  entities_pre_mined(event)
 end)
 
 script.on_event(defines.events.on_pre_player_mined_item, function(event)
-	entities_pre_mined(event)
+  entities_pre_mined(event)
 end)
 
 ---------------------------------------------------
 -- Others
 ---------------------------------------------------
 
 script.on_event(defines.events.on_entity_settings_pasted, function(event)
-	entities_settings_pasted(event)
+  entities_settings_pasted(event)
 end)
 
 script.on_event(defines.events.on_marked_for_deconstruction, function(event)
-	entities_marked_for_deconstruction(event)
+  entities_marked_for_deconstruction(event)
 end)
-