aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/me/Danker/DankersSkyblockMod.java10
-rw-r--r--src/main/java/me/Danker/commands/ToggleCommand.java48
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java25
3 files changed, 60 insertions, 23 deletions
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 2c75a0e..7e67d6c 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -464,6 +464,16 @@ public class DankersSkyblockMod
event.setCanceled(true);
return;
}
+ // Ability Cooldown
+ if (!ToggleCommand.cooldownMessages && message.contains("This ability is currently on cooldown for") && message.contains("more second")) {
+ event.setCanceled(true);
+ return;
+ }
+ // Out of mana messages
+ if (!ToggleCommand.manaMessages && message.contains("You do not have enough mana to do this!")) {
+ event.setCanceled(true);
+ return;
+ }
if (!ToggleCommand.implosionMessages) {
if (message.contains("Your Implosion hit ") || message.contains("There are blocks in the way")) {
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 5c473e5..b94bc16 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -23,17 +23,21 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean spiritBearAlerts;
public static boolean aotdToggled;
public static boolean lividDaggerToggled;
- public static boolean sceptreMessages;
public static boolean petColoursToggled;
public static boolean dungeonTimerToggled;
public static boolean golemAlertToggled;
public static boolean expertiseLoreToggled;
public static boolean skill50DisplayToggled;
public static boolean outlineTextToggled;
+ public static boolean cakeTimerToggled;
+ // Chat Messages
+ public static boolean sceptreMessages;
public static boolean midasStaffMessages;
public static boolean implosionMessages;
public static boolean healMessages;
- public static boolean cakeTimerToggled;
+ public static boolean cooldownMessages;
+ public static boolean manaMessages;
+ // Dungeons Messages
public static boolean lowHealthNotifyToggled;
public static boolean lividSolverToggled;
public static boolean stopSalvageStarredToggled;
@@ -61,30 +65,30 @@ public class ToggleCommand extends CommandBase implements ICommand {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/" +
- "aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" +
- "outlinetext/midasstaffmessages/implosionmessages/healmessages/caketimer/lowhealthnotify/" +
- "lividsolver/stopsalvagestarred/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" +
- "startswithterminal/selectallterminal/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/pickblockinexperiments/list>";
+ return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/" +
+ "aotd/lividdagger/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" +
+ "outlinetext/sceptremessages/midasstaffmessages/implosionmessages/healmessages/manamessages/cooldownmessages/caketimer/" +
+ "lowhealthnotify/lividsolver/stopsalvagestarred/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" +
+ "startswithterminal/selectallterminal/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/pickblockinexperiments/list>";
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
-
+
@Override
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts",
- "splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger",
- "sceptremessages", "petcolors", "dungeontimer", "golemalerts",
- "expertiselore", "skill50display", "outlinetext", "midasstaffmessages",
- "implosionmessages", "healmessages", "caketimer", "lowhealthnotify",
- "lividsolver", "stopsalvagestarred", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
- "creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "startswithterminal",
- "selectallterminal", "itemframeonsealanterns", "ultrasequencer",
- "chronomatron", "superpairs", "pickblockinexperiments", "list");
+ "splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger",
+ "petcolors", "dungeontimer", "golemalerts", "expertiselore",
+ "skill50display", "outlinetext","sceptremessages", "midasstaffmessages",
+ "implosionmessages", "healmessages", "manamessages", "cooldownmessages","caketimer",
+ "lowhealthnotify", "lividsolver", "stopsalvagestarred", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
+ "creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "startswithterminal",
+ "selectallterminal", "itemframeonsealanterns", "ultrasequencer",
+ "chronomatron", "superpairs", "pickblockinexperiments", "list");
}
return null;
}
@@ -169,6 +173,16 @@ public class ToggleCommand extends CommandBase implements ICommand {
ConfigHandler.writeBooleanConfig("toggles", "HealMessages", healMessages);
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Heal messages have been set to " + DankersSkyblockMod.SECONDARY_COLOUR + healMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
break;
+ case "cooldownmessages":
+ cooldownMessages = !cooldownMessages;
+ ConfigHandler.writeBooleanConfig("toggles", "CooldownMessages", cooldownMessages);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Ability cooldown messages has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + cooldownMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
+ break;
+ case "manamessages":
+ manaMessages = !manaMessages;
+ ConfigHandler.writeBooleanConfig("toggles", "ManaMessages", manaMessages);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Out of mana messages has been set to " + DankersSkyblockMod.SECONDARY_COLOUR + manaMessages + DankersSkyblockMod.MAIN_COLOUR + "."));
+ break;
case "petcolors":
case "petcolours":
petColoursToggled = !petColoursToggled;
@@ -300,6 +314,8 @@ public class ToggleCommand extends CommandBase implements ICommand {
DankersSkyblockMod.TYPE_COLOUR + " Midas Staff messages: " + DankersSkyblockMod.VALUE_COLOUR + midasStaffMessages + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Implosion messages: " + DankersSkyblockMod.VALUE_COLOUR + implosionMessages + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Heal messages: " + DankersSkyblockMod.VALUE_COLOUR + healMessages + "\n" +
+ DankersSkyblockMod.TYPE_COLOUR + " Ability cooldown messages: " + DankersSkyblockMod.VALUE_COLOUR + cooldownMessages + "\n" +
+ DankersSkyblockMod.TYPE_COLOUR + " Out of mana messages: " + DankersSkyblockMod.VALUE_COLOUR + manaMessages + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Pet colours: " + DankersSkyblockMod.VALUE_COLOUR + petColoursToggled + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Dungeon timer: " + DankersSkyblockMod.VALUE_COLOUR + dungeonTimerToggled + "\n" +
DankersSkyblockMod.TYPE_COLOUR + " Golem spawn alerts: " + DankersSkyblockMod.VALUE_COLOUR + golemAlertToggled + "\n" +
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 23bd6c4..2e4b43e 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -177,18 +177,25 @@ public class ConfigHandler {
if (!hasKey("toggles", "SpiritBearAlerts")) writeBooleanConfig("toggles", "SpiritBearAlerts", true);
if (!hasKey("toggles", "AOTD")) writeBooleanConfig("toggles", "AOTD", false);
if (!hasKey("toggles", "LividDagger")) writeBooleanConfig("toggles", "LividDagger", false);
- if (!hasKey("toggles", "SceptreMessages")) writeBooleanConfig("toggles", "SceptreMessages", true);
if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true);
if (!hasKey("toggles", "ImplosionMessages")) writeBooleanConfig("toggles", "ImplosionMessages", true);
if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true);
if (!hasKey("toggles", "PetColors")) writeBooleanConfig("toggles", "PetColors", false);
- if (!hasKey("toggles", "DungeonTimer")) writeBooleanConfig("toggles", "DungeonTimer", false);
if (!hasKey("toggles", "BlockSlayer")) writeStringConfig("toggles", "BlockSlayer", "");
if (!hasKey("toggles", "GolemAlerts")) writeBooleanConfig("toggles", "GolemAlerts", false);
if (!hasKey("toggles", "ExpertiseLore")) writeBooleanConfig("toggles", "ExpertiseLore", true);
if (!hasKey("toggles", "Skill50Display")) writeBooleanConfig("toggles", "Skill50Display", false);
if (!hasKey("toggles", "OutlineText")) writeBooleanConfig("toggles", "OutlineText", false);
if (!hasKey("toggles", "CakeTimer")) writeBooleanConfig("toggles", "CakeTimer", false);
+ // Chat Messages
+ if (!hasKey("toggles", "SceptreMessages")) writeBooleanConfig("toggles", "SceptreMessages", true);
+ if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true);
+ if (!hasKey("toggles", "ImplosionMessages")) writeBooleanConfig("toggles", "ImplosionMessages", true);
+ if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true);
+ if (!hasKey("toggles", "CooldownMessages")) writeBooleanConfig("toggles","CooldownMessages",true);
+ if (!hasKey("toggles", "ManaMessages")) writeBooleanConfig("toggles","ManaMessages",true);
+ // Dungeons
+ if (!hasKey("toggles", "DungeonTimer")) writeBooleanConfig("toggles", "DungeonTimer", false);
if (!hasKey("toggles", "LowHealthNotify")) writeBooleanConfig("toggles", "LowHealthNotify", false);
if (!hasKey("toggles", "LividSolver")) writeBooleanConfig("toggles", "LividSolver", false);
if (!hasKey("toggles", "StopSalvageStarred")) writeBooleanConfig("toggles", "StopSalvageStarred", false);
@@ -428,17 +435,21 @@ public class ConfigHandler {
ToggleCommand.spiritBearAlerts = getBoolean("toggles", "SpiritBearAlerts");
ToggleCommand.aotdToggled = getBoolean("toggles", "AOTD");
ToggleCommand.lividDaggerToggled = getBoolean("toggles", "LividDagger");
- ToggleCommand.sceptreMessages = getBoolean("toggles", "SceptreMessages");
- ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
- ToggleCommand.implosionMessages = getBoolean("toggles", "ImplosionMessages");
- ToggleCommand.healMessages = getBoolean("toggles", "HealMessages");
ToggleCommand.petColoursToggled = getBoolean("toggles", "PetColors");
- ToggleCommand.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
ToggleCommand.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
ToggleCommand.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
ToggleCommand.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
ToggleCommand.outlineTextToggled = getBoolean("toggles", "OutlineText");
ToggleCommand.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
+ // Chat Messages
+ ToggleCommand.sceptreMessages = getBoolean("toggles", "SceptreMessages");
+ ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
+ ToggleCommand.implosionMessages = getBoolean("toggles", "ImplosionMessages");
+ ToggleCommand.healMessages = getBoolean("toggles", "HealMessages");
+ ToggleCommand.cooldownMessages = getBoolean("toggles", "CooldownMessages");
+ ToggleCommand.manaMessages = getBoolean("toggles", "ManaMessages");
+ //Dungeons
+ ToggleCommand.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
ToggleCommand.lowHealthNotifyToggled = getBoolean("toggles", "LowHealthNotify");
ToggleCommand.lividSolverToggled = getBoolean("toggles", "LividSolver");
ToggleCommand.stopSalvageStarredToggled = getBoolean("toggles", "StopSalvageStarred");
generated by cgit (git 2.46.0) at 2024-12-13 23:52:50 +0000