added InventoryManagement for clearArea

Author: ChristophLHR

builder-lib.lua

@@ -7,12 +7,15 @@ local Builder_Lib = {
 }
 
 
----@class SCM
+---@type SCM
 local scm = require("./scm")
 
----@class turtleController
+---@type turtleController
 local turtleController = scm:load("turtleController")
 
+---@type TurtleResourceManager
+local tResourceManager = scm:load("turtleResourceManager")
+
 turtleController.canBreakBlocks = true
 
 local function selectItemToPlace(itemname)
@@ -115,20 +118,31 @@ function Builder_Lib:clearArea(length, width, height)
                 turtleController:tryAction("digU")
             end
         end
+    end    
+    
+    local filterFunc = function(item)
+        return string.find(item.name, "coal") == nil
     end
+    
     length = length or 1
     width = width or 1
     height = height or 1
 
 
     local currentHeight = 1
     local k = 1
+    local manageSpace = tResourceManager:checkSetup()
     while true do 
         for j = 1, width, 1 do
             for i = 1, length - 1, 1 do
                 upDownDig(currentHeight, height)
                 turtleController:goStraight(1)
             end
+            if manageSpace then
+                if tResourceManager:manageSpace(10, filterFunc) == 3 then
+                    error("Errorhandling not finished, cound not pickup Chest!")
+                end
+            end
             upDownDig(currentHeight, height)
             if (j < width) then
                 getTurningDirection(self, j, k, width)

fetch-deps.sh

@@ -15,6 +15,8 @@ libs=(
     "turtleEmulator-lib"
     "turtleController-lib"
     "eventHandler-lib"
+    "turtleResourceManager-lib"
+    "config-lib"
 )
 
 # Basic setup variables

tests/clearArea_spec.lua

@@ -42,9 +42,12 @@ local helper = require("helperFunctions")
 ---@type Vector
 _G.vector = require("vector")
 
----@type TextUtils
 _G.textutils = require("textutils")
 
+---@type SettingsManager
+_G.settings = require("settings")
+
+
 ---@type Builder_Lib
 local builder
 
@@ -222,4 +225,26 @@ describe("Testing ClearArea Function", function()
         assert.are.equal(0,m)
     end)
 
+    it("Test ChestDumping", function()
+        builder.movementDirection.height = "up"
+        builder.movementDirection.width = "right"
+        
+        for i = 2, 14, 1 do
+            turtle.addItemToInventory({name = "minecraft:dirt", count = 64, maxcount = 64, placeAble = true}, i)
+        end
+        local tmpChest = {name = "enderstorage:ender_chest", count = 1, maxcount = 1, placeAble = true}
+        turtle.addItemToInventory(tmpChest, 16)
+        local enderCHest = turtleEmulator:addInventoryToItem(tmpChest)
+
+        builder:clearArea(5,5,5)
+        local n = countTableLength(turtleEmulator.blocks)
+        assert(998 - (5*5*5), n)
+        local m, blocks = checkEmptyFromTo(vector.new(0,0,0),vector.new(4,4,4))
+        assert.are.equal(0,m)
+        assert.are.same("minecraft:coal", turtle.getItemDetail(1).name)
+        assert.are.same("minecraft:stone", turtle.getItemDetail(2).name) -- only does the last Line without clearing inventory
+        assert.are.same(nil, turtle.getItemDetail(3))
+        assert.are.same("minecraft:dirt", turtle.getItemDetail(14).name)
+    end)
+
 end)

tests/floor_spec.lua

@@ -40,6 +40,9 @@ local builder
 
 _G.textutils = require("textutils")
 
+---@type SettingsManager
+_G.settings = require("settings")
+
 
 ---@type TurtleEmulator
 local turtleEmulator = require("turtleEmulator")