Remove features

Remove blocking starting wrong slayer quest
Remove blocking using abilities
Remove placing flower weapons
Remove blocking misclicks in solvers
Remove F7 arrow terminal solver

17 files changed, 18 insertions, 807 deletions

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 0d6dbac..3aeb452 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -88,14 +88,9 @@ public class DankersSkyblockMod {
     public void init(FMLInitializationEvent event) throws UnsupportedAudioFileException, IOException, LineUnavailableException {
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(new ArachneESP());
-        MinecraftForge.EVENT_BUS.register(new ArrowTerminalSolver());
         MinecraftForge.EVENT_BUS.register(new AutoDisplay());
         MinecraftForge.EVENT_BUS.register(new AutoSwapToPickBlock());
         MinecraftForge.EVENT_BUS.register(new BlazeSolver());
-        MinecraftForge.EVENT_BUS.register(new BlockAbilities());
-        MinecraftForge.EVENT_BUS.register(new BlockPlacingFlowers());
-        MinecraftForge.EVENT_BUS.register(new BlockWrongSlayer());
-        MinecraftForge.EVENT_BUS.register(new BlockWrongTerminalClicks());
         MinecraftForge.EVENT_BUS.register(new BonzoMaskTimer());
         MinecraftForge.EVENT_BUS.register(new BoulderSolver());
         MinecraftForge.EVENT_BUS.register(new CakeTimer());
@@ -156,7 +151,6 @@ public class DankersSkyblockMod {
     public void preInit(final FMLPreInitializationEvent event) {
         ClientCommandHandler.instance.registerCommand(new ArmourCommand());
         ClientCommandHandler.instance.registerCommand(new BankCommand());
-        ClientCommandHandler.instance.registerCommand(new BlockSlayerCommand());
         ClientCommandHandler.instance.registerCommand(new CustomMusicCommand());
         ClientCommandHandler.instance.registerCommand(new DHelpCommand());
         ClientCommandHandler.instance.registerCommand(new DankerGuiCommand());
@@ -325,9 +319,6 @@ public class DankersSkyblockMod {
                     case "displaygui":
                         mc.displayGuiScreen(new DisplayGui());
                         break;
-                    case "onlyslayergui":
-                        mc.displayGuiScreen(new OnlySlayerGui());
-                        break;
                     case "editlocations":
                         mc.displayGuiScreen(new EditLocationsGui());
                         break;
diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
deleted file mode 100644
index 06fb4ef..0000000
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package me.Danker.commands;
-
-import me.Danker.DankersSkyblockMod;
-import me.Danker.features.BlockWrongSlayer;
-import me.Danker.handlers.ConfigHandler;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.ChatComponentText;
-
-import java.util.List;
-
-public class BlockSlayerCommand extends CommandBase {
-
-	@Override
-	public String getCommandName() {
-		return "onlyslayer";
-	}
-
-	@Override
-	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <zombie/spider/wolf> <1/2/3/4/5>";
-	}
-
-	public static String usage(ICommandSender arg0) {
-		return new BlockSlayerCommand().getCommandUsage(arg0);
-	}
-
-	@Override
-	public int getRequiredPermissionLevel() {
-		return 0;
-	}
-	
-	@Override
-	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
-		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "zombie", "spider", "wolf");
-		} else if (args.length == 2) {
-			return getListOfStringsMatchingLastWord(args, "1", "2", "3", "4", "5");
-		}
-		return null;
-	}
-	
-	@Override
-	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
-		final EntityPlayer player = (EntityPlayer)arg0;
-		
-		if (arg1.length == 0 || (arg1.length == 1 && !arg1[0].equalsIgnoreCase("off"))) {
-			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
-			return;
-		}
-		
-		switch (arg1[0].toLowerCase()) {
-			case "zombie":
-				BlockWrongSlayer.onlySlayerName = "Revenant Horror";
-				break;
-			case "spider":
-				BlockWrongSlayer.onlySlayerName = "Tarantula Broodfather";
-				break;
-			case "wolf":
-				BlockWrongSlayer.onlySlayerName = "Sven Packmaster";
-				break;
-			case "off":
-				BlockWrongSlayer.onlySlayerName = "";
-				BlockWrongSlayer.onlySlayerNumber = "";
-				ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking turned off."));
-				return;
-			default:
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
-				return;
-		}
-		
-		int slayerNumber = Integer.parseInt(arg1[1]);
-		// Just manually set to roman numeral, I don't wanna put a whole converter in here
-		switch (slayerNumber) {
-			case 1:
-				BlockWrongSlayer.onlySlayerNumber = "I";
-				break;
-			case 2:
-				BlockWrongSlayer.onlySlayerNumber = "II";
-				break;
-			case 3:
-				BlockWrongSlayer.onlySlayerNumber = "III";
-				break;
-			case 4:
-				BlockWrongSlayer.onlySlayerNumber = "IV";
-				break;
-			case 5:
-				BlockWrongSlayer.onlySlayerNumber = "V";
-				break;
-			default:
-				BlockWrongSlayer.onlySlayerName = "";
-				BlockWrongSlayer.onlySlayerNumber = "";
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
-				return;
-		}
-		
-		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber);
-		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber));
-	}
-
-}
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index f6cfb82..8d47576 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -52,7 +52,6 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + DungeonsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + ImportFishingCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
 													EnumChatFormatting.GOLD + SkyblockPlayersCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
-													EnumChatFormatting.GOLD + BlockSlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops you from starting a slayer quest other than the one specified.\n" +
 													EnumChatFormatting.GOLD + SkillTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
                           							EnumChatFormatting.GOLD + LobbyBankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average bank total of the lobby, as well the three players with the highest total money in the bank(and purse).\n" +
 													EnumChatFormatting.GOLD + RepartyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 40fcb0a..5076ef7 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -49,9 +49,6 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[splitfishing][").append(ToggleCommand.splitFishing).append("]\n");
 			debug.append("[chatmaddox][").append(ToggleCommand.chatMaddoxToggled).append("]\n");
 			debug.append("[spiritbearalerts][").append(ToggleCommand.spiritBearAlerts).append("]\n");
-			debug.append("[aotd][").append(ToggleCommand.aotdToggled).append("]\n");
-			debug.append("[lividdagger][").append(ToggleCommand.lividDaggerToggled).append("]\n");
-			debug.append("[flowerweapons][").append(ToggleCommand.flowerWeaponsToggled).append("]\n");
 			debug.append("[sceptremessages][").append(ToggleCommand.sceptreMessages).append("]\n");
 			debug.append("[petcolors][").append(ToggleCommand.petColoursToggled).append("]\n");
 			debug.append("[dungeontimer][").append(ToggleCommand.dungeonTimerToggled).append("]\n");
@@ -86,15 +83,11 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[startswithterminal][").append(ToggleCommand.startsWithToggled).append("]\n");
 			debug.append("[selectallterminal][").append(ToggleCommand.selectAllToggled).append("]\n");
 			debug.append("[clickinorderterminal][").append(ToggleCommand.clickInOrderToggled).append("]\n");
-			debug.append("[blockwrongterminalclicks][").append(ToggleCommand.blockWrongTerminalClicksToggled).append("]\n");
-			debug.append("[itemframeonsealanterns][").append(ToggleCommand.itemFrameOnSeaLanternsToggled).append("]\n");
 			debug.append("[ultrasequencer][").append(ToggleCommand.ultrasequencerToggled).append("]\n");
 			debug.append("[chronomatron][").append(ToggleCommand.chronomatronToggled).append("]\n");
 			debug.append("[superpairs][").append(ToggleCommand.superpairsToggled).append("]\n");
 			debug.append("[hidetooltipsinaddons][").append(ToggleCommand.hideTooltipsInExperimentAddonsToggled).append("]\n");
 			debug.append("[pickblock][").append(ToggleCommand.swapToPickBlockToggled).append("]\n");
-			debug.append("[shadowFuryAbility][").append(ToggleCommand.shadowFuryToggled).append("]\n");
-			debug.append("[specialhoe][").append(ToggleCommand.specialHoeRightClick).append("]\n");
 			debug.append("[melodyTooltips][").append(ToggleCommand.melodyTooltips).append("]\n");
 			debug.append("[dungeonbossmusic][").append(ToggleCommand.dungeonBossMusic).append("]\n");
 			debug.append("[bloodroommusic][").append(ToggleCommand.bloodRoomMusic).append("]\n");
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 73011ad..a6f20fc 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -23,9 +23,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean splitFishing;
 	public static boolean chatMaddoxToggled;
 	public static boolean spiritBearAlerts;
-	public static boolean aotdToggled;
-	public static boolean lividDaggerToggled;
-	public static boolean shadowFuryToggled;
 	public static boolean petColoursToggled;
 	public static boolean dungeonTimerToggled;
 	public static boolean ghostTimerToggled;
@@ -50,7 +47,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean stopSalvageStarredToggled;
 	public static boolean watcherReadyToggled;
 	public static boolean swapToPickBlockToggled;
-	public static boolean flowerWeaponsToggled;
 	public static boolean notifySlayerSlainToggled;
 	public static boolean necronNotificationsToggled;
 	public static boolean bonzoTimerToggled;
@@ -69,14 +65,11 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean startsWithToggled;
 	public static boolean selectAllToggled;
 	public static boolean clickInOrderToggled;
-	public static boolean blockWrongTerminalClicksToggled;
-	public static boolean itemFrameOnSeaLanternsToggled;
 	// Experiments
 	public static boolean ultrasequencerToggled;
 	public static boolean chronomatronToggled;
 	public static boolean superpairsToggled;
 	public static boolean hideTooltipsInExperimentAddonsToggled;
-	public static boolean specialHoeRightClick;
 	public static boolean melodyTooltips;
 	// Custom Music
 	public static boolean dungeonBossMusic;
@@ -92,14 +85,14 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public String getCommandUsage(ICommandSender arg0) {
 
 		return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/ghostdisplay/chatmaddox/spiritbearalert/" +
-										  "aotd/lividdagger/shadowfury/flowerweapons/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/" + //ghosttimer
+										  "sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/" + //ghosttimer
 										  "skill50display/outlinetext/midasstaffmessages/implosionmessages/healmessages/cooldownmessages/" +
 										  "manamessages/killcombomessages/caketimer/lowhealthnotify/lividsolver/stopsalvagestarred/" +
 										  "notifyslayerslain/necronnotifications/bonzotimer/threemanpuzzle/oruopuzzle/blazepuzzle/" +
 										  "creeperpuzzle/waterpuzzle/tictactoepuzzle/boulderpuzzle/silverfishpuzzle/icewalkpuzzle/watchermessage/" +
-										  "startswithterminal/selectallterminal/clickinorderterminal/blockwrongterminalclicks/" +
-										  "itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/" +
-										  "specialhoe/melodytooltips/highlightslayers/highlightarachne/dungeonbossmusic/bloodroommusic/" +
+										  "startswithterminal/selectallterminal/clickinorderterminal/" +
+										  "ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/" +
+										  "melodytooltips/highlightslayers/highlightarachne/dungeonbossmusic/bloodroommusic/" +
 										  "dungeonmusic/list>";
 	}
 
@@ -116,8 +109,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts", "highlightArachne",
-														  "splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger", "shadowfury",
-														  "flowerweapons", "sceptremessages", "petcolors", "dungeontimer", "golemalerts",
+														  "splitfishing", "chatmaddox", "spiritbearalerts",
+														  "sceptremessages", "petcolors", "dungeontimer", "golemalerts",
 														  "expertiselore", "skill50display", "outlinetext", "midasstaffmessages",
 														  "implosionmessages", "healmessages", "cooldownmessages", "manamessages",
 														  "killcombomessages", "caketimer", "lowhealthnotify", "autoskilltracker", "lividsolver",
@@ -125,9 +118,9 @@ public class ToggleCommand extends CommandBase implements ICommand {
 														  "bonzotimer", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
 														  "creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "boulderpuzzle",
 														  "silverfishpuzzle", "icewalkpuzzle", "watchermessage", "startswithterminal",
-														  "selectallterminal", "clickinorderterminal", "blockwrongterminalclicks",
-														  "itemframeonsealanterns", "ultrasequencer", "chronomatron", "superpairs",
-														  "hidetooltipsinaddons", "pickblock", "specialhoe", "melodytooltips", "highlightslayers",
+														  "selectallterminal", "clickinorderterminal",
+														  "ultrasequencer", "chronomatron", "superpairs",
+														  "hidetooltipsinaddons", "pickblock", "melodytooltips", "highlightslayers",
 														  "dungeonbossmusic", "bloodroommusic", "dungeonmusic", "list");
 		}
 		return null;
@@ -188,26 +181,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				ConfigHandler.writeBooleanConfig("toggles", "SpiritBearAlerts", spiritBearAlerts);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Spirit Bear alerts have been set to " + DankersSkyblockMod.SECONDARY_COLOUR + spiritBearAlerts + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
-			case "aotd":
-				aotdToggled = !aotdToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "AOTD", aotdToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Block AOTD ability been set to " + DankersSkyblockMod.SECONDARY_COLOUR + aotdToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
-			case "lividdagger":
-				lividDaggerToggled = !lividDaggerToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "LividDagger", lividDaggerToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Block Shadow Fury ability been set to " + DankersSkyblockMod.SECONDARY_COLOUR + shadowFuryToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
-			case "shadowfury":
-				shadowFuryToggled = !shadowFuryToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "ShadowFury", shadowFuryToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Block Livid Dagger ability been set to " + DankersSkyblockMod.SECONDARY_COLOUR + lividDaggerToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
-			case "flowerweapons":
-				flowerWeaponsToggled = !flowerWeaponsToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "FlowerWeapons", flowerWeaponsToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Prevent Placing FoT/Spirit Sceptre been set to " + DankersSkyblockMod.SECONDARY_COLOUR + flowerWeaponsToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
 			case "sceptremessages":
 				sceptreMessages = !sceptreMessages;
 				ConfigHandler.writeBooleanConfig("toggles", "SceptreMessages", sceptreMessages);
@@ -384,16 +357,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				ConfigHandler.writeBooleanConfig("toggles", "ClickInOrderTerminal", clickInOrderToggled);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Click in order terminal helper has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + selectAllToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
-			case "blockwrongterminalclicks":
-				blockWrongTerminalClicksToggled = !blockWrongTerminalClicksToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "BlockWrongTerminalClicks", blockWrongTerminalClicksToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Block wrong clicks on terminals has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + blockWrongTerminalClicksToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
-			case "itemframeonsealanterns":
-				itemFrameOnSeaLanternsToggled = !itemFrameOnSeaLanternsToggled;
-				ConfigHandler.writeBooleanConfig("toggles", "IgnoreItemFrameOnSeaLanterns", itemFrameOnSeaLanternsToggled);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Ignore item frames on sea lanterns has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + itemFrameOnSeaLanternsToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
 			case "ultrasequencer":
 				ultrasequencerToggled = !ultrasequencerToggled;
 				ConfigHandler.writeBooleanConfig("toggles", "UltraSequencer", ultrasequencerToggled);
@@ -419,11 +382,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 				ConfigHandler.writeBooleanConfig("toggles", "PickBlock", swapToPickBlockToggled);
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Auto-swap to pick block has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + swapToPickBlockToggled + DankersSkyblockMod.MAIN_COLOUR + "."));
 				break;
-			case "specialhoe":
-				specialHoeRightClick = !specialHoeRightClick;
-				ConfigHandler.writeBooleanConfig("toggles", "SpecialHoe", specialHoeRightClick);
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Block right click ability of special hoes " + DankersSkyblockMod.SECONDARY_COLOUR + specialHoeRightClick + DankersSkyblockMod.MAIN_COLOUR + "."));
-				break;
 			case "melodytooltips":
 				melodyTooltips = !melodyTooltips;
 				ConfigHandler.writeBooleanConfig("toggles", "MelodyTooltips", melodyTooltips);
@@ -465,9 +423,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 															DankersSkyblockMod.TYPE_COLOUR + " Split fishing display: " + DankersSkyblockMod.VALUE_COLOUR + splitFishing + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Chat Maddox menu: " + DankersSkyblockMod.VALUE_COLOUR + chatMaddoxToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Spirit Bear alerts: " + DankersSkyblockMod.VALUE_COLOUR + spiritBearAlerts + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Block AOTD ability: " + DankersSkyblockMod.VALUE_COLOUR + aotdToggled + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Block Livid Dagger ability: " + DankersSkyblockMod.VALUE_COLOUR + lividDaggerToggled + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Prevent Placing FoT/Spirit Sceptre: " + DankersSkyblockMod.VALUE_COLOUR + flowerWeaponsToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Spirit Sceptre messages: " + DankersSkyblockMod.VALUE_COLOUR + sceptreMessages + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Midas Staff messages: " + DankersSkyblockMod.VALUE_COLOUR + midasStaffMessages + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Implosion messages: " + DankersSkyblockMod.VALUE_COLOUR + implosionMessages + "\n" +
@@ -496,13 +451,11 @@ public class ToggleCommand extends CommandBase implements ICommand {
 															DankersSkyblockMod.TYPE_COLOUR + " Watcher ready message: " + DankersSkyblockMod.VALUE_COLOUR + watcherReadyToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Starts with letter terminal solver: " + DankersSkyblockMod.VALUE_COLOUR + startsWithToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Select all color items terminal solver: " + DankersSkyblockMod.VALUE_COLOUR + selectAllToggled + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Ignore item frames on sea lanterns: " + DankersSkyblockMod.VALUE_COLOUR + itemFrameOnSeaLanternsToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Ultra sequencer solver: " + DankersSkyblockMod.VALUE_COLOUR + ultrasequencerToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Chronomatron solver: " + DankersSkyblockMod.VALUE_COLOUR + chronomatronToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Superpairs solver: " + DankersSkyblockMod.VALUE_COLOUR + superpairsToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Hide tooltips in experiment addons: " + DankersSkyblockMod.VALUE_COLOUR + hideTooltipsInExperimentAddonsToggled + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Auto-swap to pick block " + DankersSkyblockMod.VALUE_COLOUR + swapToPickBlockToggled + "\n" +
-															DankersSkyblockMod.TYPE_COLOUR + " Block Special Hoe right click " + DankersSkyblockMod.VALUE_COLOUR + specialHoeRightClick + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Hide tooltips in Melody's Harp " + DankersSkyblockMod.VALUE_COLOUR + melodyTooltips + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Highlight Slayer Bosses " + DankersSkyblockMod.VALUE_COLOUR + highlightSlayers + "\n" +
 															DankersSkyblockMod.TYPE_COLOUR + " Highlight Arachne Boss " + DankersSkyblockMod.VALUE_COLOUR + highlightArachne + "\n" +
diff --git a/src/main/java/me/Danker/features/BlockAbilities.java b/src/main/java/me/Danker/features/BlockAbilities.java
deleted file mode 100644
index 814fd65..0000000
--- a/src/main/java/me/Danker/features/BlockAbilities.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package me.Danker.features;
-
-import me.Danker.commands.ToggleCommand;
-import me.Danker.utils.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class BlockAbilities {
-
-    @SubscribeEvent
-    public void onInteract(PlayerInteractEvent event) {
-        if (!Utils.inSkyblock || Minecraft.getMinecraft().thePlayer != event.entityPlayer) return;
-        ItemStack item = event.entityPlayer.getHeldItem();
-        if (item == null) return;
-
-        if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) {
-            if (ToggleCommand.aotdToggled && item.getDisplayName().contains("Aspect of the Dragons")) {
-                event.setCanceled(true);
-            }
-            if (ToggleCommand.lividDaggerToggled && item.getDisplayName().contains("Livid Dagger")) {
-                event.setCanceled(true);
-            }
-            if (ToggleCommand.shadowFuryToggled && item.getDisplayName().contains("Shadow Fury")) {
-                event.setCanceled(true);
-            }
-            if (ToggleCommand.specialHoeRightClick && (item.getDisplayName().contains("Mathematical Hoe") || item.getDisplayName().contains("Potato Hoe") || item.getDisplayName().contains("Wheat Hoe") || item.getDisplayName().contains("Carrot Hoe") || item.getDisplayName().contains("Sugar Cane Hoe") || item.getDisplayName().contains("Nether Warts Hoe"))) {
-                event.setCanceled(true);
-            }
-        } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-            Block block = Minecraft.getMinecraft().theWorld.getBlockState(event.pos).getBlock();
-
-            ArrayList<Block> interactables = new ArrayList<>(Arrays.asList(
-                    Blocks.acacia_door,
-                    Blocks.anvil,
-                    Blocks.beacon,
-                    Blocks.bed,
-                    Blocks.birch_door,
-                    Blocks.brewing_stand,
-                    Blocks.command_block,
-                    Blocks.crafting_table,
-                    Blocks.chest,
-                    Blocks.dark_oak_door,
-                    Blocks.daylight_detector,
-                    Blocks.daylight_detector_inverted,
-                    Blocks.dispenser,
-                    Blocks.dropper,
-                    Blocks.enchanting_table,
-                    Blocks.ender_chest,
-                    Blocks.furnace,
-                    Blocks.hopper,
-                    Blocks.jungle_door,
-                    Blocks.lever,
-                    Blocks.noteblock,
-                    Blocks.powered_comparator,
-                    Blocks.unpowered_comparator,
-                    Blocks.powered_repeater,
-                    Blocks.unpowered_repeater,
-                    Blocks.standing_sign,
-                    Blocks.wall_sign,
-                    Blocks.trapdoor,
-                    Blocks.trapped_chest,
-                    Blocks.wooden_button,
-                    Blocks.stone_button,
-                    Blocks.oak_door,
-                    Blocks.skull
-            ));
-            if (Utils.inDungeons) {
-                interactables.add(Blocks.coal_block);
-                interactables.add(Blocks.stained_hardened_clay);
-            }
-
-            if (!interactables.contains(block)) {
-                if (ToggleCommand.aotdToggled && item.getDisplayName().contains("Aspect of the Dragons")) {
-                    event.setCanceled(true);
-                }
-                if (ToggleCommand.lividDaggerToggled && item.getDisplayName().contains("Livid Dagger")) {
-                    event.setCanceled(true);
-                }
-                if (ToggleCommand.shadowFuryToggled && item.getDisplayName().contains("Shadow Fury")) {
-                    event.setCanceled(true);
-                }
-            }
-            if (ToggleCommand.specialHoeRightClick && (item.getDisplayName().contains("Mathematical Hoe") || item.getDisplayName().contains("Potato Hoe") || item.getDisplayName().contains("Wheat Hoe") || item.getDisplayName().contains("Carrot Hoe") || item.getDisplayName().contains("Sugar Cane Hoe") || item.getDisplayName().contains("Nether Warts Hoe"))) {
-                event.setCanceled(true);
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/me/Danker/features/BlockPlacingFlowers.java b/src/main/java/me/Danker/features/BlockPlacingFlowers.java
deleted file mode 100644
index 9bfc986..0000000
--- a/src/main/java/me/Danker/features/BlockPlacingFlowers.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package me.Danker.features;
-
-import me.Danker.commands.ToggleCommand;
-import me.Danker.utils.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class BlockPlacingFlowers {
-
-    @SubscribeEvent
-    public void onInteract(PlayerInteractEvent event) {
-        if (!Utils.inSkyblock || Minecraft.getMinecraft().thePlayer != event.entityPlayer) return;
-        ItemStack item = event.entityPlayer.getHeldItem();
-        if (item == null) return;
-
-        if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-            Block block = Minecraft.getMinecraft().theWorld.getBlockState(event.pos).getBlock();
-
-            ArrayList<Block> flowerPlaceable = new ArrayList<>(Arrays.asList(
-                    Blocks.grass,
-                    Blocks.dirt,
-                    Blocks.flower_pot,
-                    Blocks.tallgrass,
-                    Blocks.double_plant
-            ));
-            if (flowerPlaceable.contains(block)) {
-                if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Flower of Truth")) {
-                    event.setCanceled(true);
-                }
-                if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Spirit Sceptre")) {
-                    event.setCanceled(true);
-                }
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/me/Danker/features/BlockWrongSlayer.java b/src/main/java/me/Danker/features/BlockWrongSlayer.java
deleted file mode 100644
index 6da4798..0000000
--- a/src/main/java/me/Danker/features/BlockWrongSlayer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package me.Danker.features;
-
-import me.Danker.DankersSkyblockMod;
-import me.Danker.events.ChestSlotClickedEvent;
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-public class BlockWrongSlayer {
-
-    public static String onlySlayerName = "";
-    public static String onlySlayerNumber = "";
-
-    @SubscribeEvent
-    public void onSlotClick(ChestSlotClickedEvent event) {
-        String inventoryName = event.inventoryName;
-        ItemStack item = event.item;
-        if (!onlySlayerName.equals("") && item != null) {
-            if (inventoryName.equals("Slayer")) {
-                if (!item.getDisplayName().contains("Revenant Horror") && !item.getDisplayName().contains("Tarantula Broodfather") && !item.getDisplayName().contains("Sven Packmaster"))
-                    return;
-                if (!item.getDisplayName().contains(onlySlayerName)) {
-                    Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Danker's Skyblock Mod has stopped you from starting this quest (Set to " + onlySlayerName + " " + onlySlayerNumber + ")"));
-                    Minecraft.getMinecraft().thePlayer.playSound("note.bass", 1, (float) 0.5);
-                    event.setCanceled(true);
-                }
-            } else if (inventoryName.equals("Revenant Horror") || inventoryName.equals("Tarantula Broodfather") || inventoryName.equals("Sven Packmaster")) {
-                if (item.getDisplayName().contains("Revenant Horror") || item.getDisplayName().contains("Tarantula Broodfather") || item.getDisplayName().contains("Sven Packmaster")) {
-                    // Only check number as they passed the above check
-                    String slayerNumber = item.getDisplayName().substring(item.getDisplayName().lastIndexOf(" ") + 1);
-                    if (!slayerNumber.equals(onlySlayerNumber)) {
-                        Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Danker's Skyblock Mod has stopped you from starting this quest (Set to " + onlySlayerName + " " + onlySlayerNumber + ")"));
-                        Minecraft.getMinecraft().thePlayer.playSound("note.bass", 1, (float) 0.5);
-                        event.setCanceled(true);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/me/Danker/features/puzzlesolvers/ArrowTerminalSolver.java b/src/main/java/me/Danker/features/puzzlesolvers/ArrowTerminalSolver.java
deleted file mode 100644
index 35458f3..0000000
--- a/src/main/java/me/Danker/features/puzzlesolvers/ArrowTerminalSolver.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package me.Danker.features.puzzlesolvers;
-
-import me.Danker.commands.ToggleCommand;
-import me.Danker.utils.Utils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.item.EntityItemFrame;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
-import net.minecraftforge.event.entity.player.EntityInteractEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-public class ArrowTerminalSolver {
-
-    @SubscribeEvent
-    public void onEntityInteract(EntityInteractEvent event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        if (mc.thePlayer != event.entityPlayer) return;
-
-        if (ToggleCommand.itemFrameOnSeaLanternsToggled && Utils.inDungeons && event.target instanceof EntityItemFrame) {
-            EntityItemFrame itemFrame = (EntityItemFrame) event.target;
-            ItemStack item = itemFrame.getDisplayedItem();
-            if (item == null || item.getItem() != Items.arrow) return;
-            BlockPos blockPos = Utils.getBlockUnderItemFrame(itemFrame);
-            if (mc.theWorld.getBlockState(blockPos).getBlock() == Blocks.sea_lantern) {
-                event.setCanceled(true);
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/me/Danker/features/puzzlesolvers/BlockWrongTerminalClicks.java b/src/main/java/me/Danker/features/puzzlesolvers/BlockWrongTerminalClicks.java
deleted file mode 100644
index 5176e8b..0000000
--- a/src/main/java/me/Danker/features/puzzlesolvers/BlockWrongTerminalClicks.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package me.Danker.features.puzzlesolvers;
-
-import me.Danker.commands.ToggleCommand;
-import me.Danker.events.ChestSlotClickedEvent;
-import me.Danker.utils.Utils;
-import net.minecraft.init.Blocks;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StringUtils;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import org.lwjgl.input.Keyboard;
-
-public class Bl