From d15dab55955a39a601704c7e6f24dccdf9aa1966 Mon Sep 17 00:00:00 2001
From: brulijam <brulijam@brulijam.com>
Date: Tue, 25 Jun 2024 23:15:57 +0200
Subject: [PATCH] did stuff

---
 src/brulijam/files/t-farmer2.lua    | 80 +++++++++++++++++++++++++++++
 src/brulijam/lib/basic.lua          |  8 +++
 src/brulijam/turtle-roomCreator.lua | 15 +++---
 src/startup.lua                     |  7 +++
 4 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100755 src/brulijam/files/t-farmer2.lua

diff --git a/src/brulijam/files/t-farmer2.lua b/src/brulijam/files/t-farmer2.lua
new file mode 100755
index 0000000..9fe0e3d
--- /dev/null
+++ b/src/brulijam/files/t-farmer2.lua
@@ -0,0 +1,80 @@
+basic = require("lib.basic")
+
+
+
+local toPlant = {
+  [1] = "minecraft:wheat_seeds",
+  [2] = "minecraft:potato",
+  [3] = "minecraft:carrot",
+}
+
+local toCollect = {
+  [1] = "minecraft:wheat",
+  [2] = "minecraft:potato",
+  [3] = "minecraft:carrot",
+}
+
+local function doAllFields()
+
+  local numFieldsDepth = 2
+  local numFieldsWidth = 2
+
+  turtle.up()
+
+  --for each column
+  for i=1, numFieldsDepth do
+    for j=1, numFieldsWidth do
+      doOneField()
+    end
+  end
+end
+
+
+--start = 0
+--1231 2132 3123 1321
+--
+--1. +1 aufsteigend
+--2. +1 absteigend
+--3. +1 aufsteigend
+--4. +1 absteigend
+local function doOneField()
+  for i=1, 4 do --for 4 rows
+    for j=1, 4 do
+      turtle.digDown()
+      turtle.suckUp()
+
+      --get next crop
+      if i%2==1 then
+        currentSeed = currentSeed + 1
+        if currentSeed > 3 then
+          currentSeed = 1
+        end
+      elseif i%2==0 then
+        currentSeed = currentSeed - 1
+        if currentSeed > 3 then
+          currentSeed = 1
+        end
+      end
+    end
+  end
+end
+
+
+
+local function main()
+  while true do
+    for i=1, 600 do
+      basic.clearDisplay()
+      print(i*5 .. "/3000")
+      sleep(5)
+    end
+    doAllFields()
+    sortAway()
+    goToStart()
+  end
+end
+
+
+
+currentSeed = 0
+main()
\ No newline at end of file
diff --git a/src/brulijam/lib/basic.lua b/src/brulijam/lib/basic.lua
index 2749a2a..78487a6 100755
--- a/src/brulijam/lib/basic.lua
+++ b/src/brulijam/lib/basic.lua
@@ -53,6 +53,14 @@ function ntfy(msg)
 	http.post(getNtfyAddress(), "[" .. os.getComputerLabel() .. "] " .. msg)
 end
 
+local function getTutelServer()
+	return readFileOneline("/brulijam/config/tutelServer.txt")
+end
+
+function telegramNotifier()
+	http.post()
+end
+
 function splitStringToArray(inputStr)
 	table = {}
 	i = 0
diff --git a/src/brulijam/turtle-roomCreator.lua b/src/brulijam/turtle-roomCreator.lua
index a6fc109..681b694 100755
--- a/src/brulijam/turtle-roomCreator.lua
+++ b/src/brulijam/turtle-roomCreator.lua
@@ -1,13 +1,14 @@
 basic = require("lib.basic")
+tutel = require("lib.tutel")
 
 function excavate(depth, width, height)
-    -- Digging loop
+    -- secureDigging loop
     for h = 1, height do
-        -- Digging a layer
+        -- secureDigging a layer
         for w = 1, width do
-            -- Digging a row
+            -- secureDigging a row
             for d = 1, depth-1 do
-                turtle.dig() -- Digging forward
+                tutel.secureDig() -- secureDigging forward
                 turtle.forward() -- Moving forward
             end
             --move to start of row
@@ -18,7 +19,7 @@ function excavate(depth, width, height)
             -- go to next row if not last row
             if w<width then
                 turtle.turnRight()
-                turtle.dig()
+                tutel.secureDig()
                 turtle.forward()
                 turtle.turnLeft()
             end
@@ -33,7 +34,7 @@ function excavate(depth, width, height)
         
         --go to next layer if not last layer
         if h<height then
-            turtle.digUp()
+            tutel.secureDigUp()
             turtle.up()
         end
     end
@@ -46,7 +47,7 @@ end
 
 
 basic.clearDisplay()
-print("[Digs a Quader]")
+print("[secureDigs a Quader]")
 write("depth: ")
 depth = tonumber(read())
 write("width: ")
diff --git a/src/startup.lua b/src/startup.lua
index 71b3532..682722e 100755
--- a/src/startup.lua
+++ b/src/startup.lua
@@ -58,6 +58,13 @@ if not (fs.exists("brulijam/config/ntfy.txt")) then
   file.close()
 end
 
+--create tutelServer file (can be changed later)
+if not (fs.exists("/brulijam/config/tutelServer.txt")) then
+  file = fs.open("/brulijam/config/tutelServer.txt", "a")
+  file.writeLine("https://seals.social/minecraftapi")
+  file.close()
+end
+
 
 -- vulna because you can terminate startup
 print("Press Return to continue")