Merge pull request #11 from czho/master

Food management

Author: Avanatiker

src/main/kotlin/HighwayTools.kt

@@ -12,6 +12,8 @@ import com.lambda.client.util.threads.safeListener
 import com.lambda.event.listener.listener
 import net.minecraft.block.Block
 import net.minecraft.init.Blocks
+import net.minecraft.init.Items
+import net.minecraft.item.Item
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import trombone.IO.DebugMessages
 import trombone.IO.DisableMode
@@ -68,6 +70,7 @@ object HighwayTools : PluginModule(
     val railingHeight by setting("Railing Height", 1, 1..4, 1, { railing && page == Page.BUILD && mode == Mode.HIGHWAY }, description = "Sets height of railing")
     private val materialSaved = setting("Material", "minecraft:obsidian", { false })
     private val fillerMatSaved = setting("FillerMat", "minecraft:netherrack", { false })
+    private val foodItem = setting("Food Item", "minecraft:golden_apple", { false })
     val ignoreBlocks = setting(CollectionSetting("IgnoreList", defaultIgnoreBlocks, { false }))
 
     // behavior settings
@@ -93,9 +96,12 @@ object HighwayTools : PluginModule(
     val storageManagement by setting("Manage Storage", true, { page == Page.STORAGE_MANAGEMENT }, description = "Choose to interact with container using only packets.")
     val leaveEmptyShulkers by setting("Leave Empty Shulkers", true, { page == Page.STORAGE_MANAGEMENT && storageManagement }, description = "Does not break empty shulkers.")
     val grindObsidian by setting("Grind Obsidian", true, { page == Page.STORAGE_MANAGEMENT }, description = "Destroy Ender Chests to obtain Obsidian.")
+    val manageFood by setting("Manage Food", true, { page == Page.STORAGE_MANAGEMENT }, description = "Choose to manage food.")
     val saveMaterial by setting("Save Material", 12, 0..64, 1, { page == Page.STORAGE_MANAGEMENT }, description = "How many material blocks are saved")
     val saveTools by setting("Save Tools", 1, 0..36, 1, { page == Page.STORAGE_MANAGEMENT }, description = "How many tools are saved")
     val saveEnder by setting("Save Ender Chests", 1, 0..64, 1, { page == Page.STORAGE_MANAGEMENT }, description = "How many ender chests are saved")
+    val saveFood by setting("Save Food", 1, 0..64, 1, { page == Page.STORAGE_MANAGEMENT && manageFood}, description = "How many food items are saved")
+
     val disableMode by setting("Disable Mode", DisableMode.NONE, { page == Page.STORAGE_MANAGEMENT }, description = "Choose action when bot is out of materials or tools")
     val usingProxy by setting("Proxy", false, { disableMode == DisableMode.LOGOUT && page == Page.STORAGE_MANAGEMENT }, description = "Enable this if you are using a proxy to call the given command")
     val proxyCommand by setting("Proxy Command", "/dc", { usingProxy && disableMode == DisableMode.LOGOUT && page == Page.STORAGE_MANAGEMENT }, description = "Command to be sent to log out")
@@ -133,6 +139,12 @@ object HighwayTools : PluginModule(
         set(value) {
             fillerMatSaved.value = value.registryName.toString()
         }
+    var food: Item
+        get() = Item.getByNameOrId(foodItem.value) ?: Items.GOLDEN_APPLE
+        set(value) {
+            foodItem.value = value.registryName.toString()
+        }
+
 
     override fun isActive(): Boolean {
         return isEnabled && active

src/main/kotlin/HighwayToolsCommand.kt

@@ -88,6 +88,15 @@ object HighwayToolsCommand : ClientCommand(
             }
         }
 
+        literal("food", "fd") {
+            item("item") { itemArg ->
+                execute("Set a block as filler material") {
+                    HighwayTools.food = itemArg.value
+                    sendChatMessage("Set your food item to &7${itemArg.value.registryName}&r.")
+                }
+            }
+        }
+
         execute("Print the settings") {
             printSettings()
         }

src/main/kotlin/trombone/handler/Tasks.kt

@@ -6,12 +6,15 @@ import HighwayTools.debugMessages
 import HighwayTools.dynamicDelay
 import HighwayTools.fakeSounds
 import HighwayTools.fillerMat
+import HighwayTools.food
 import HighwayTools.ignoreBlocks
 import HighwayTools.material
 import HighwayTools.maxReach
 import HighwayTools.mode
 import HighwayTools.multiBuilding
 import HighwayTools.saveTools
+import HighwayTools.saveFood
+import HighwayTools.manageFood
 import com.lambda.client.event.SafeClientEvent
 import com.lambda.client.module.modules.player.InventoryManager
 import com.lambda.client.util.items.*
@@ -193,11 +196,19 @@ object Tasks {
                 }
             }
             tasks.values.all { it.taskState == TaskState.DONE } -> {
+                if (manageFood && player.inventorySlots.countItem(food) < saveFood) {
+                    handleRestock(food)
+                }
+
                 updateTasks()
             }
             else -> {
                 waitTicks--
 
+                if (manageFood && player.inventorySlots.countItem(food) < saveFood) {
+                    handleRestock(food)
+                }
+
                 tasks.values.toList().forEach {
                     doTask(it, true)
                 }