From 16959d6e65f55c851c3bb45a943d98e09efaa66f Mon Sep 17 00:00:00 2001 From: CarbonNeuron Date: Fri, 1 May 2020 08:28:22 -0500 Subject: [PATCH] Remove AutoLook.cs Chatbot because it is not in main project. Also removes it in McTcpClient.cs, and gets rid of the Settings.cs and Default paramaters. --- MinecraftClient/ChatBots/AutoLook.cs | 66 -------------------------- MinecraftClient/McTcpClient.cs | 1 - MinecraftClient/MinecraftClient.csproj | 1 - MinecraftClient/Settings.cs | 14 +----- 4 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 MinecraftClient/ChatBots/AutoLook.cs diff --git a/MinecraftClient/ChatBots/AutoLook.cs b/MinecraftClient/ChatBots/AutoLook.cs deleted file mode 100644 index 053d63b0..00000000 --- a/MinecraftClient/ChatBots/AutoLook.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using MinecraftClient.Mapping; - -namespace MinecraftClient.ChatBots -{ - public class AutoLook : ChatBot - { - private Entity _entityToLookAt; - public override void Initialize() - { - if (GetEntityHandlingEnabled() && GetTerrainEnabled()) return; - LogToConsole("Entity Handling or Terrain Handling is not enabled in the config file!"); - LogToConsole("This bot will be unloaded."); - UnloadBot(); - } - - public override void OnEntityDespawn(Entity entity) - { - if (entity == _entityToLookAt) - { - _entityToLookAt = null; - } - } - public override void OnEntitySpawn(Entity entity) - { - HandleEntity(entity); - } - public override void OnEntityMove(Entity entity) - { - var tempBool = HandleEntity(entity); - LogDebugToConsole(tempBool); - if (!tempBool) return; - LookAtLocation(entity.Location); - } - - /// - /// Handles an entity, and tracks it if it is closer then the one we are currently tracking - /// - /// True if found - private bool HandleEntity(Entity entity) - { - if (entity.Type != EntityType.Player) - { - return false; - } - if (_entityToLookAt == null) - { - _entityToLookAt = entity; - return true; - } - if (GetCurrentLocation().Distance(entity.Location) < GetCurrentLocation().Distance(_entityToLookAt.Location)) - { - _entityToLookAt = entity; - return true; - } - - if (entity.ID != _entityToLookAt.ID) return false; - _entityToLookAt = entity; //Handle looking at the same entity - return true; - - } - - } -} \ No newline at end of file diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs index 340883a1..5651761a 100644 --- a/MinecraftClient/McTcpClient.cs +++ b/MinecraftClient/McTcpClient.cs @@ -170,7 +170,6 @@ namespace MinecraftClient if (Settings.AutoAttack_Enabled) { BotLoad(new ChatBots.AutoAttack()); } if (Settings.AutoFishing_Enabled) { BotLoad(new ChatBots.AutoFishing()); } if (Settings.AutoEat_Enabled) { BotLoad(new ChatBots.AutoEat(Settings.AutoEat_hungerThreshold)); } - if (Settings.AutoLook_Enabled) { BotLoad(new ChatBots.AutoLook()); } //Add your ChatBot here by uncommenting and adapting //BotLoad(new ChatBots.YourBot()); diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj index 84871504..590438b1 100644 --- a/MinecraftClient/MinecraftClient.csproj +++ b/MinecraftClient/MinecraftClient.csproj @@ -78,7 +78,6 @@ - diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index bebf12bb..c1ecb9cd 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -170,7 +170,7 @@ namespace MinecraftClient private static readonly Dictionary> Accounts = new Dictionary>(); private static readonly Dictionary> Servers = new Dictionary>(); - private enum ParseMode { Default, Main, AppVars, Proxy, MCSettings, AntiAFK, Hangman, Alerts, ChatLog, AutoRelog, ScriptScheduler, RemoteControl, ChatFormat, AutoRespond, AutoAttack, AutoFishing, AutoEat, AutoLook }; + private enum ParseMode { Default, Main, AppVars, Proxy, MCSettings, AntiAFK, Hangman, Alerts, ChatLog, AutoRelog, ScriptScheduler, RemoteControl, ChatFormat, AutoRespond, AutoAttack, AutoFishing, AutoEat }; /// /// Load settings from the give INI file @@ -214,7 +214,6 @@ namespace MinecraftClient case "autoattack": pMode = ParseMode.AutoAttack; break; case "autofishing": pMode = ParseMode.AutoFishing; break; case "autoeat": pMode = ParseMode.AutoEat; break; - case "autolook": pMode = ParseMode.AutoLook; break; default: pMode = ParseMode.Default; break; } } @@ -470,13 +469,6 @@ namespace MinecraftClient case "matchesfile": AutoRespond_Matches = argValue; break; } break; - case ParseMode.AutoLook: - switch (argName.ToLower()) - { - case "enabled": AutoLook_Enabled = str2bool(argValue); break; - } - break; - case ParseMode.AutoAttack: switch (argName.ToLower()) { @@ -705,10 +697,6 @@ namespace MinecraftClient + "# Inventory Handling NEED to be enabled first\r\n" + "enabled=false\r\n" + "threshold=6\r\n" - + "\r\n" - + "[AutoLook]\r\n" - + "# Entity Handling AND Terrain Handling NEEDS to be enabled first\r\n" - + "enabled=false" + "\r\n", Encoding.UTF8); }