aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/me/Danker/DankersSkyblockMod.java12
-rw-r--r--src/main/java/me/Danker/commands/DHelpCommand.java8
-rw-r--r--src/main/java/me/Danker/commands/ToggleCommand.java8
-rw-r--r--src/main/java/me/Danker/commands/warp/Crypt.java43
-rw-r--r--src/main/java/me/Danker/commands/warp/DarkAuction.java44
-rw-r--r--src/main/java/me/Danker/commands/warp/Dragon.java44
-rw-r--r--src/main/java/me/Danker/commands/warp/DungeonHub.java44
-rw-r--r--src/main/java/me/Danker/commands/warp/HowlingCave.java43
-rw-r--r--src/main/java/me/Danker/commands/warp/Magma.java43
-rw-r--r--src/main/java/me/Danker/commands/warp/SpidersNest.java43
-rw-r--r--src/main/java/me/Danker/features/HighlightCommissions.java39
-rw-r--r--src/main/java/me/Danker/features/SpamHider.java2
-rw-r--r--src/main/java/me/Danker/gui/DankerGui.java8
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java2
14 files changed, 379 insertions, 4 deletions
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index fb98068..6fa1995 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -2,6 +2,7 @@ package me.Danker;
import com.google.gson.JsonObject;
import me.Danker.commands.*;
+import me.Danker.commands.warp.*;
import me.Danker.events.ChestSlotClickedEvent;
import me.Danker.events.GuiChestBackgroundDrawnEvent;
import me.Danker.events.RenderOverlayEvent;
@@ -163,7 +164,7 @@ public class DankersSkyblockMod {
MinecraftForge.EVENT_BUS.register(new UpdateChecker());
MinecraftForge.EVENT_BUS.register(new WatcherReadyAlert());
MinecraftForge.EVENT_BUS.register(new WaterSolver());
-
+ MinecraftForge.EVENT_BUS.register(new HighlightCommissions());
MinecraftForge.EVENT_BUS.register(new LootDisplay());
MinecraftForge.EVENT_BUS.register(new LootTracker());
MinecraftForge.EVENT_BUS.register(new BlazeTracker());
@@ -205,7 +206,6 @@ public class DankersSkyblockMod {
ClientCommandHandler.instance.registerCommand(new DHelpCommand());
ClientCommandHandler.instance.registerCommand(new DankerGuiCommand());
ClientCommandHandler.instance.registerCommand(new DisplayCommand());
- ClientCommandHandler.instance.registerCommand(new DungeonsCommand());
ClientCommandHandler.instance.registerCommand(new FairySoulsCommand());
ClientCommandHandler.instance.registerCommand(new FarmLengthCommand());
ClientCommandHandler.instance.registerCommand(new GetkeyCommand());
@@ -232,6 +232,14 @@ public class DankersSkyblockMod {
ClientCommandHandler.instance.registerCommand(new ToggleCommand());
ClientCommandHandler.instance.registerCommand(new WeightCommand());
+ ClientCommandHandler.instance.registerCommand(new Crypt());
+ ClientCommandHandler.instance.registerCommand(new DarkAuction());
+ ClientCommandHandler.instance.registerCommand(new Dragon());
+ ClientCommandHandler.instance.registerCommand(new DungeonHub());
+ ClientCommandHandler.instance.registerCommand(new HowlingCave());
+ ClientCommandHandler.instance.registerCommand(new Magma());
+ ClientCommandHandler.instance.registerCommand(new SpidersNest());
+
configDirectory = event.getModConfigurationDirectory().toString();
}
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index 477d43b..db474c7 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -1,6 +1,7 @@
package me.Danker.commands;
import me.Danker.DankersSkyblockMod;
+import me.Danker.commands.warp.*;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
@@ -59,6 +60,13 @@ public class DHelpCommand extends CommandBase {
EnumChatFormatting.GOLD + RepartyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
EnumChatFormatting.GOLD + CustomMusicCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops or reloads the custom music.\n" +
EnumChatFormatting.GOLD + PlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find skills, slayers, coins and weight of a player.\n" +
+ EnumChatFormatting.GOLD + Crypt.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Crypt in the Hub. \n" +
+ EnumChatFormatting.GOLD + DarkAuction.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Dark Auction in the Hub. \n" +
+ EnumChatFormatting.GOLD + Dragon.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Dragons Nest in the End. \n" +
+ EnumChatFormatting.GOLD + DungeonHub.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Dungeon Hub. \n" +
+ EnumChatFormatting.GOLD + HowlingCave.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Howling Cave in the Park. \n" +
+ EnumChatFormatting.GOLD + Magma.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Magma Fields in the Blazing Fortress. \n" +
+ EnumChatFormatting.GOLD + SpidersNest.usage(arg0) + EnumChatFormatting.AQUA + " - Warps you to the Top of the Spider's Nest in the Spider's Den. \n" +
EnumChatFormatting.GOLD + ReloadConfigCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod config.\n" +
EnumChatFormatting.GOLD + ReloadRepoCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod repository.\n" +
EnumChatFormatting.GOLD + FarmLengthCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Sets coords to be used for end of farm alert.\n" +
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 3536bd7..6b659ab 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -39,6 +39,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean teammatesInRadius;
public static boolean giantHP;
public static boolean hidePetCandy;
+ public static boolean highlightCommissions;
public static boolean customColouredNames;
public static boolean endOfFarmAlert;
public static boolean gemstoneLore;
@@ -151,7 +152,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
"gemstonelore", "crystalhollowwaypoints", "crystalautowaypoints", "autoacceptreparty",
"itemcooldowns", "hubmusic", "islandmusic", "dungeonhubmusic", "farmingislandsmusic", "goldminemusic",
"deepcavernsmusic", "dwarvenminesmusic", "crystalhollowsmusic", "spidersdenmusic", "blazingfortressmusic",
- "endmusic", "parkmusic", "alerts", "dungeonscore", "list");
+ "endmusic", "parkmusic", "alerts", "dungeonscore", "highlightcommissions", "list");
}
return null;
}
@@ -467,6 +468,10 @@ public class ToggleCommand extends CommandBase implements ICommand {
ConfigHandler.writeBooleanConfig("toggles", "HidePetCandy", hidePetCandy);
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Hide pet candy has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + hidePetCandy + DankersSkyblockMod.MAIN_COLOUR + "."));
break;
+ case "highlightcommissions":
+ highlightCommissions = !highlightCommissions;
+ ConfigHandler.writeBooleanConfig("toggles", "HighlightCommissions", highlightCommissions);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Highlight Commissions has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + highlightCommissions + DankersSkyblockMod.MAIN_COLOUR + "."));
case "customcolorednames":
case "customcolourednames":
customColouredNames = !customColouredNames;
@@ -655,6 +660,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
DankersSkyblockMod.TYPE_COLOUR + " Teammates in radius: " + DankersSkyblockMod.VALUE_COLOUR + teammatesInRadius + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Giant HP display: " + DankersSkyblockMod.VALUE_COLOUR + giantHP + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Hide pet candy: " + DankersSkyblockMod.VALUE_COLOUR + hidePetCandy + "\n" +
+ DankersSkyblockMod.TYPE_COLOUR + " Highlight commissions: " + DankersSkyblockMod.VALUE_COLOUR + highlightCommissions + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Custom name colors: " + DankersSkyblockMod.VALUE_COLOUR + customColouredNames + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " End of farm alert: " + DankersSkyblockMod.VALUE_COLOUR + endOfFarmAlert + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Gemstone in lore: " + DankersSkyblockMod.VALUE_COLOUR + gemstoneLore + "\n" +
diff --git a/src/main/java/me/Danker/commands/warp/Crypt.java b/src/main/java/me/Danker/commands/warp/Crypt.java
new file mode 100644
index 0000000..fd91790
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Crypt.java
@@ -0,0 +1,43 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class Crypt extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "crypt";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.Crypt().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp crypt");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/DarkAuction.java b/src/main/java/me/Danker/commands/warp/DarkAuction.java
new file mode 100644
index 0000000..d2cffe9
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/DarkAuction.java
@@ -0,0 +1,44 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class DarkAuction extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "da";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.DarkAuction().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp da");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/Dragon.java b/src/main/java/me/Danker/commands/warp/Dragon.java
new file mode 100644
index 0000000..a0cf9ab
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Dragon.java
@@ -0,0 +1,44 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class Dragon extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "drag";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.DarkAuction().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp drag");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/DungeonHub.java b/src/main/java/me/Danker/commands/warp/DungeonHub.java
new file mode 100644
index 0000000..3031fec
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/DungeonHub.java
@@ -0,0 +1,44 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class DungeonHub extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "dun";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.DungeonHub().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp dungeon_hub");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/HowlingCave.java b/src/main/java/me/Danker/commands/warp/HowlingCave.java
new file mode 100644
index 0000000..1d45ada
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/HowlingCave.java
@@ -0,0 +1,43 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class HowlingCave extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "howl";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.HowlingCave().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp howl");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/Magma.java b/src/main/java/me/Danker/commands/warp/Magma.java
new file mode 100644
index 0000000..4f7459d
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Magma.java
@@ -0,0 +1,43 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class Magma extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "magma";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.Magma().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp magma");
+ }
+}
diff --git a/src/main/java/me/Danker/commands/warp/SpidersNest.java b/src/main/java/me/Danker/commands/warp/SpidersNest.java
new file mode 100644
index 0000000..ecea275
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/SpidersNest.java
@@ -0,0 +1,43 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+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 java.util.List;
+
+public class SpidersNest extends CommandBase {
+ @Override
+ public String getCommandName() {
+ return "nest";
+ }
+
+ @Override
+ public String getCommandUsage(ICommandSender sender) {
+ return "/" + getCommandName();
+ }
+
+ public static String usage(ICommandSender arg0) {
+ return new me.Danker.commands.warp.SpidersNest().getCommandUsage(arg0);
+ }
+
+ @Override
+ public int getRequiredPermissionLevel() {
+ return 0;
+ }
+
+ @Override
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ return null;
+ }
+
+ @Override
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+ if (!Utils.inSkyblock) return;
+ Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp nest");
+ }
+}
diff --git a/src/main/java/me/Danker/features/HighlightCommissions.java b/src/main/java/me/Danker/features/HighlightCommissions.java
new file mode 100644
index 0000000..f59951a
--- /dev/null
+++ b/src/main/java/me/Danker/features/HighlightCommissions.java
@@ -0,0 +1,39 @@
+package me.Danker.features;
+
+import me.Danker.commands.ToggleCommand;
+import me.Danker.events.GuiChestBackgroundDrawnEvent;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.utils.Utils;
+import net.minecraft.inventory.Slot;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraft.item.ItemWritableBook;
+
+import org.lwjgl.util.Color;
+import java.util.List;
+
+public class HighlightCommissions {
+
+ public static int HIGHLIGHT_COLOUR;
+
+ @SubscribeEvent
+ public void onGuiRender(GuiChestBackgroundDrawnEvent event) {
+ if(!Utils.inSkyblock) return;
+ if(!ToggleCommand.highlightCommissions) return;
+ List<Slot> slots = event.slots;
+ if (!event.displayName.equals("Commissions")) return;
+
+ for (Slot slot : slots) {
+ if (slot != null && slot.getStack() == null) continue;
+ if (slot.getStack().getItem() instanceof ItemWritableBook) {
+ for (String line : Utils.getItemLore(slot.getStack())) {
+ if (line.contains("COMPLETED")) {
+ Utils.drawOnSlot(event.chestSize, slot.xDisplayPosition, slot.yDisplayPosition, HIGHLIGHT_COLOUR + 0xD7000000);
+ break;
+ }
+ }
+
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/me/Danker/features/SpamHider.java b/src/main/java/me/Danker/features/SpamHider.java
index a88d9e5..f1a40c9 100644
--- a/src/main/java/me/Danker/features/SpamHider.java
+++ b/src/main/java/me/Danker/features/SpamHider.java
@@ -49,7 +49,7 @@ public class SpamHider {
}
// Kill Combo
if (!ToggleCommand.killComboMessages) {
- if ((message.contains("+") && message.contains(" Kill Combo ")) || message.contains("Your Kill Combo has expired!")) {
+ if ((message.contains("+") && message.contains(" Kill Combo")) || message.contains("Your Kill Combo has expired!")) {
event.setCanceled(true);
}
}
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 4285d16..95c0629 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -13,6 +13,7 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.client.gui.*;
import net.minecraft.util.StringUtils;
import java.awt.*;
@@ -71,6 +72,7 @@ public class DankerGui extends GuiScreen {
private GuiButton teammatesInRadius;
private GuiButton giantHP;
private GuiButton hidePetCandy;
+ private GuiButton highlightCommissions;
private GuiButton customColouredNames;
private GuiButton endOfFarmAlert;
private GuiButton gemstoneLore;
@@ -171,6 +173,7 @@ public class DankerGui extends GuiScreen {
teammatesInRadius = new FeatureButton("Display Players in 30 Block Radius: " + Utils.getColouredBoolean(ToggleCommand.teammatesInRadius), "Displays dungeon teammates in 30 block radius for tether and diversion.");
giantHP = new FeatureButton("Display Giant HP: " + Utils.getColouredBoolean(ToggleCommand.giantHP), "Displays health of Sadan's giants during F6 bossfight and F7 blood room.");
hidePetCandy = new FeatureButton("Hide Pet Candy: " + Utils.getColouredBoolean(ToggleCommand.hidePetCandy), "Hide pet candy in pet tooltips.");
+ highlightCommissions = new FeatureButton("Highlight Commissions: " + Utils.getColouredBoolean(ToggleCommand.highlightCommissions), "Show which commissions are completed.");
customColouredNames = new FeatureButton("Custom Name Colors: " + Utils.getColouredBoolean(ToggleCommand.customColouredNames), "Replaces some player's usernames with a custom color.");
endOfFarmAlert = new FeatureButton("Alert When Reaching End of Farm: " + Utils.getColouredBoolean(ToggleCommand.endOfFarmAlert), "Alerts when you go past coords set with /dsmfarmlength.");
gemstoneLore = new FeatureButton("Applied Gemstones in Lore: " + Utils.getColouredBoolean(ToggleCommand.gemstoneLore), "Adds applied gemstones to item tooltip.");
@@ -229,6 +232,7 @@ public class DankerGui extends GuiScreen {
allButtons.add(teammatesInRadius);
allButtons.add(giantHP);
allButtons.add(hidePetCandy);
+ allButtons.add(highlightCommissions);
allButtons.add(customColouredNames);
allButtons.add(endOfFarmAlert);
allButtons.add(gemstoneLore);
@@ -488,6 +492,10 @@ public class DankerGui extends GuiScreen {
ToggleCommand.hidePetCandy = !ToggleCommand.hidePetCandy;
ConfigHandler.writeBooleanConfig("toggles", "HidePetCandy", ToggleCommand.hidePetCandy);
hidePetCandy.displayString = "Hide Pet Candy: " + Utils.getColouredBoolean(ToggleCommand.hidePetCandy);
+ } else if (button == highlightCommissions) {
+ ToggleCommand.highlightCommissions = !ToggleCommand.highlightCommissions;
+ ConfigHandler.writeBooleanConfig("toggles", "HighlightCommissions", ToggleCommand.highlightCommissions);
+ highlightCommissions.displayString = "Highlight Commissions: " + Utils.getColouredBoolean(ToggleCommand.highlightCommissions);
} else if (button == customColouredNames) {
ToggleCommand.customColouredNames = !ToggleCommand.customColouredNames;
ConfigHandler.writeBooleanConfig("toggles", "CustomColouredNames", ToggleCommand.customColouredNames);
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 1267b9b..f5e2706 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -217,6 +217,7 @@ public class ConfigHandler {
ToggleCommand.melodyTooltips = initBoolean("toggles", "MelodyTooltips", false);
ToggleCommand.highlightSlayers = initBoolean("toggles", "HighlightSlayers", false);
ToggleCommand.highlightArachne = initBoolean("toggles", "HighlightArachne", false);
+ ToggleCommand.highlightCommissions = initBoolean("toggles", "HighlightCommissions", false);
ToggleCommand.highlightSkeletonMasters = initBoolean("toggles", "HighlightSkeletonMasters", false);
ToggleCommand.teammatesInRadius = initBoolean("toggles", "TeammatesInRadius", false);
ToggleCommand.giantHP = initBoolean("toggles", "GiantHP", false);
@@ -698,6 +699,7 @@ public class ConfigHandler {
BoulderSolver.BOULDER_ARROW_COLOUR = initInt("colors", "boulderArrow", 0x006000);
SilverfishSolver.SILVERFISH_LINE_COLOUR = initInt("colors", "silverfishLine", 0x40FF40);
IceWalkSolver.ICE_WALK_LINE_COLOUR = initInt("colors", "iceWalkLine", 0x40FF40);
+ HighlightCommissions.HIGHLIGHT_COLOUR = initInt("colors", "highlight_colour", 0x51FF51);
// Commands
if (!hasKey("commands", "reparty")) writeBooleanConfig("commands", "reparty", false);