Merge pull request #9 from theRustyKnife/1.6-dev

1.6.1

Author: theRustyKnife

manual-inventory-sort/changelog.txt

@@ -1,68 +1,71 @@
-##1.6.0##
+## 1.6.1 ##
+* Fixed stackable items with equipment grids could get deleted in some cases ([14638](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/14638))
+
+## 1.6.0 ##
 * Updated for Factorio 0.15
 
-##1.5.5##
+## 1.5.5 ##
 * Fixed sorting of certain items would cause a crash when there were filters for them ([6067](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/6067))
 * Fixed a possible crash when sorting cars or wagons with bigger inventories than any chest
 
-##1.5.4##
+## 1.5.4 ##
 * Fixed filtered car sorting ([5284](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/5284))
 
-##1.5.3##
+## 1.5.3 ##
 * Fixed temporary chests being selectable ([3947](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/3947))
 
-##1.5.2##
+## 1.5.2 ##
 * No more temporary entity spawning and destroying on every player inventory sort
 * Fixed filtered cargo-wagons weren't sorted properly
 
-##1.5.1##
+## 1.5.1 ##
 * Removed the left-over debugging message when auto-sorting
 
-##1.5.0##
+## 1.5.0 ##
 * Internal changes
 * Improved auto-sort performance ([3558](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/3558))
 
-##1.4.5##
+## 1.4.5 ##
 * Fixed GUI buttons would not appear when opened a logistic chest
 + Added car and wagon sorting
 + Added Russian translation thanks to [Apriori](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/3041)
 
-##1.4.4##
+## 1.4.4 ##
 * Updated for Factorio 0.14
 
-##1.4.3##
+## 1.4.3 ##
 * Fixed sorting big chests caused a crash ([2008](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/2008))
 
-##1.4.2##
+## 1.4.2 ##
 * Fixed logistic chests were not sortable ([1519](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/1519))
 
-##1.4.1##
+## 1.4.1 ##
 * Fixed a bug causing a crash when loading existing saves without the mod installed before ([1494](https://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort/discussion/1494))
 
-##1.4.0##
+## 1.4.0 ##
 * Fixed broken migration script (hopefully), apologies to anyone who had problems with this - it should be safe now to migrate from any version to 1.4
 + Added sorting GUI
 
-##1.3.0##
+## 1.3.0 ##
 * Changed the default shortcuts to use shift instead of ctrl (it's a lot more comfortable this way)
 + Added chest sorting
 
-##1.2.0##
+## 1.2.0 ##
 + Addded an options menu
 + Added part inventory sorting
 
-##1.1.2##
+## 1.1.2 ##
 * Use of new API features of 0.13.12 to get rid of the need to place temporary entities
 
-##1.1.1##
+## 1.1.1 ##
 * Fixed auto-sort performance, now sorting is done only when actually needed
 
-##1.1.0##
+## 1.1.0 ##
 * Fixed a bug making it possible to duplicate items with durability in certain cases
 + Added the auto-sort feature. It has performance problems to be solved though.
 
-##1.0.1##
+## 1.0.1 ##
 * Fixed a bug causing items to be lost when inserted in the tick after sorting was triggered
 
-##1.0.0##
+## 1.0.0 ##
 + Initial release

manual-inventory-sort/info.json

@@ -1,11 +1,12 @@
 {
 	"name": "manual-inventory-sort",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"factorio_version": "0.15",
 	"title": "Manual Inventory Sorting",
 	"author": "TheRustyKnife",
-	"description": "Makes some tweaks to the way inventory sorting works.\nYou can sort your inventory on demand or toggle auto-sort. Auto-sort can be configured to work for just a part of your inventory. \nIt's also possible to sort chests, cars and cargo wagons. \n0.15 supported!",
+	"contact": "[email protected]",
+	"description": "Makes some tweaks to the way inventory sorting works.\nYou can sort your inventory on demand or toggle auto-sort. Auto-sort can be configured to work for just a part of your inventory. \nIt's also possible to sort chests, cars and cargo wagons.",
 	"homepage": "http://mods.factorio.com/mods/theRustyKnife/manual-inventory-sort",
-	"date": "24.04.2017",
+	"date": "2017-06-05",
 	"dependencies": ["base"]
-}
+}

manual-inventory-sort/script/sorting.lua

@@ -148,28 +148,35 @@ function sorting.sort_inventory(arg)
 	for i = 1, #orders do -- go one order at a time, this also ensures that there's going to be only one item type in each iteration of this loop
 		local t_stacks = util.get_staks_with_order(orders[i], stacks)
 		local damaged_stacks = {} -- because stacks with damage go at the end
+		local stacks_with_grid = {} -- put stacks with any equipment in their grid at the end (before damaged)
 		local first = true -- first can't merge with previous stacks, since they're a different type
 		i_slots.current_name = t_stacks[1].stack.name
 		iterate_i_slots(i_slots, inventory)
 
 		for i_stack = 1, #t_stacks do
 			local c_stack = t_stacks[i_stack]
 
+			local extra_properties = {}
+			if c_stack.stack.grid and next(c_stack.stack.grid.equipment) ~= nil then extra_properties.grid = true; end
+			if c_stack.stack.health and c_stack.stack.health ~= 1 and not extra_properties.grid then extra_properties.health = c_stack.stack.health; end -- don't insert if item has grid as that already handles moving to end
+			
 			if not first and t_chest_inventory[i_slots.current].valid_for_read and t_chest_inventory[i_slots.current].name == c_stack.stack.name then -- there's a stack available for merge
 				local free_space = c_stack.prototype.stack_size -  t_chest_inventory[i_slots.current].count
 
-				local extra_properties = {}
-				if c_stack.stack.type == "ammo" then extra_properties.ammo = c_stack.stack.ammo end
-				if c_stack.stack.health and c_stack.stack.health ~= 1 then extra_properties.health = c_stack.stack.health end
-				if c_stack.stack.durability then extra_properties.durability = c_stack.stack.durability end
+				-- these are only needed when merging, so no point in getting them otherwise
+				if c_stack.stack.type == "ammo" then extra_properties.ammo = c_stack.stack.ammo; end
+				if c_stack.stack.durability then extra_properties.durability = c_stack.stack.durability; end
 
-				if extra_properties.ammo then -- ammo
+				if extra_properties.ammo then -- ammo - maybe move this after the health and grid checks? Can ammo have health or grid?
 					t_chest_inventory[i_slots.next].set_stack(c_stack.stack) -- put the stack into the next slot
 					if util.compress_ammo(t_chest_inventory[i_slots.current], t_chest_inventory[i_slots.next]) then iterate_i_slots(i_slots, inventory) end -- merge stacks and only iterate i_slots.i if the next slot still as something in it
-					
+				
+				elseif extra_properties.grid then -- item has an equipment grid attached to it - same as health
+					table.insert(stacks_with_grid, c_stack)
+				
 				elseif extra_properties.health then -- item is damaged - put at the end and do not stack!
 					table.insert(damaged_stacks, c_stack)
-					
+				
 				elseif extra_properties.durability then -- durability (same as ammo)
 					t_chest_inventory[i_slots.next].set_stack(c_stack.stack)
 					if util.compress_usable_stacks(t_chest_inventory[i_slots.current], t_chest_inventory[i_slots.next]) then iterate_i_slots(i_slots, inventory) end
@@ -186,7 +193,10 @@ function sorting.sort_inventory(arg)
 					end
 				end
 			else -- there are no stacks to merge with
-				if c_stack.stack.health and c_stack.stack.health ~= 1 then -- damaged - goes to the end
+				if extra_properties.grid then -- has grid - goes to the end
+					table.insert(stacks_with_grid, c_stack)
+				
+				elseif extra_properties.health then -- damaged - goes to the end
 					table.insert(damaged_stacks, c_stack)
 
 				else -- set it to the next stack
@@ -196,6 +206,11 @@ function sorting.sort_inventory(arg)
 			end
 		end
 
+		for i_grid = 1, #stacks_with_grid do -- insert stacks with grid (not sure what vanilla behavior is here, but I'm guessing it doesn't matter all that much)
+			if not first then iterate_i_slots(i_slots, inventory) else first = false; end -- same as damaged
+			t_chest_inventory[i_slots.current].set_stack(stacks_with_grid[i_grid].stack)
+		end
+		
 		for i_damaged = 1, #damaged_stacks do -- insert the dmaged stacks (for now these are inserted in the order they were originally - vanilla sorts them by ammount of health left)
 			if not first then iterate_i_slots(i_slots, inventory) else first = false end -- prevent overwriting last non-damaged slot if there is one
 			t_chest_inventory[i_slots.current].set_stack(damaged_stacks[i_damaged].stack)