From 96a66c3336467095b662f61dc458e2f12078dd35 Mon Sep 17 00:00:00 2001
From: theFox6 <the.fox6@gmx.de>
Date: Tue, 29 Sep 2020 14:38:42 +0200
Subject: [PATCH] do not stack tools with different wear

---
 modules/network/init.lua    | 14 ++++++++++----
 modules/network/network.lua |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/network/init.lua b/modules/network/init.lua
index 1b1055a..d39c3ec 100644
--- a/modules/network/init.lua
+++ b/modules/network/init.lua
@@ -4,32 +4,38 @@ local networks = me.networks
 local path     = microexpansion.get_module_path("network")
 
 local function split_stack_values(stack)
-  local stack_name, stack_count, stack_meta
+  local stack_name, stack_count, stack_wear, stack_meta
   if type(stack) == "string" then
     local split_string = stack:split(" ")
     stack_name = split_string[1]
     if (#split_string > 1) then
       stack_count = tonumber(split_string[2])
+      if (#split_string > 2) then
+        stack_wear = tonumber(split_string[3])
+      else
+        stack_wear = 0
+      end
     else
       stack_count = 1
     end
   else
     stack_name = stack:get_name()
     stack_count = stack:get_count()
+    stack_wear = stack:get_wear()
     stack_meta = stack:get_meta()
   end
-  return stack_name, stack_count, stack_meta
+  return stack_name, stack_count, stack_wear, stack_meta
 end
 
 function me.insert_item(stack, inv, listname)
   if me.settings.huge_stacks == false then
     return inv:add_item(listname, stack)
   end
-  local stack_name,stack_count,stack_meta = split_stack_values(stack)
+  local stack_name,stack_count,stack_wear,stack_meta = split_stack_values(stack)
   local found = false
   for i = 0, inv:get_size(listname) do
     local inside = inv:get_stack(listname, i)
-    if inside:get_name() == stack_name then
+    if inside:get_name() == stack_name and inside:get_wear() == stack_wear then
       if inside:get_meta():equals(stack_meta) then
         local total_count = inside:get_count() + stack_count
         -- bigger item count is not possible we only have unsigned 16 bit
diff --git a/modules/network/network.lua b/modules/network/network.lua
index 4108eb1..5fd9ac6 100644
--- a/modules/network/network.lua
+++ b/modules/network/network.lua
@@ -209,7 +209,7 @@ local function create_inventory(net)
       local inside_stack = inv:get_stack(listname, index)
       local stack_name = stack:get_name()
       -- improve performance by skipping unnessecary calls
-      if inside_stack:get_name() ~= stack_name or inside_stack:get_count() >= inside_stack:get_stack_max()  then
+      if inside_stack:get_name() ~= stack_name or inside_stack:get_count() >= inside_stack:get_stack_max() then
         if inv:get_stack(listname, index+1):get_name() ~= "" then
           return stack:get_count()
         end