aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/me/Danker/features/NecronNotifications.java79
-rw-r--r--src/main/java/me/Danker/gui/DankerGui.java4
2 files changed, 43 insertions, 40 deletions
diff --git a/src/main/java/me/Danker/features/NecronNotifications.java b/src/main/java/me/Danker/features/NecronNotifications.java
index d35996c..323e7f8 100644
--- a/src/main/java/me/Danker/features/NecronNotifications.java
+++ b/src/main/java/me/Danker/features/NecronNotifications.java
@@ -24,55 +24,58 @@ public class NecronNotifications {
if (!Utils.inDungeons) return;
- if (ToggleCommand.necronNotificationsToggled && message.contains("[BOSS] Necron:")) {
+ if (ToggleCommand.necronNotificationsToggled) {
Minecraft mc = Minecraft.getMinecraft();
World world = mc.theWorld;
- if (message.contains("You tricked me!") || message.contains("That beam, it hurts! IT HURTS!!")) {
- Utils.createTitle(EnumChatFormatting.RED + "NECRON STUCK!", 2);
- } else if (message.contains("STOP USING MY FACTORY AGAINST ME!") || message.contains("OOF") || message.contains("ANOTHER TRAP!! YOUR TRICKS ARE FUTILE!") || message.contains("SERIOUSLY? AGAIN?!") || message.contains("STOP!!!!!")) {
- List<EntityArmorStand> necronLabels = world.getEntities(EntityArmorStand.class, (entity -> {
- if (!entity.hasCustomName()) return false;
- if (!entity.getCustomNameTag().contains("Necron")) return false;
- return true;
- }));
- if (necronLabels.size() == 0) {
- Utils.createTitle(EnumChatFormatting.WHITE + "NECRON STUNNED!", 2);
- } else {
- EntityArmorStand necron = necronLabels.get(0);
- double x = necron.posX;
- double z = necron.posZ;
- BlockPos blockPos = new BlockPos(x, 168, z);
+ if (message.startsWith("[BOSS] Maxor:")) {
+ if (message.contains("THAT BEAM! IT HURTS! IT HURTS!!") || message.contains("YOU TRICKED ME!")) {
+ Utils.createTitle(EnumChatFormatting.RED + "MAXOR STUCK!", 2);
+ }
+ } else if (message.startsWith("[BOSS] Storm:")) {
+ if (message.contains("Ouch, that hurt!") || message.contains("Oof")) {
+ List<EntityArmorStand> stormLabels = world.getEntities(EntityArmorStand.class, (entity -> {
+ if (!entity.hasCustomName()) return false;
+ return entity.getCustomNameTag().contains("Storm");
+ }));
+ if (stormLabels.size() == 0) {
+ Utils.createTitle(EnumChatFormatting.WHITE + "STORM STUNNED!", 2);
+ } else {
+ EntityArmorStand storm = stormLabels.get(0);
+ double x = storm.posX;
+ double z = storm.posZ;
- IBlockState blockState = world.getBlockState(blockPos);
- Block block = blockState.getBlock();
+ BlockPos blockPos = new BlockPos(x, 168, z);
- if (block != Blocks.stained_hardened_clay) {
- Utils.createTitle(EnumChatFormatting.WHITE + "NECRON STUNNED!", 2);
- } else {
- switch (block.getDamageValue(world, blockPos)) {
- case 4:
- Utils.createTitle(EnumChatFormatting.YELLOW + "YELLOW PILLAR!", 2);
- break;
- case 5:
- Utils.createTitle(EnumChatFormatting.DARK_GREEN + "GREEN PILLAR!", 2);
- break;
- case 11:
- Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "PURPLE PILLAR!", 2);
- break;
- default:
- Utils.createTitle(EnumChatFormatting.WHITE + "NECRON STUNNED!", 2);
+ IBlockState blockState = world.getBlockState(blockPos);
+ Block block = blockState.getBlock();
+
+ if (block != Blocks.stained_hardened_clay) {
+ Utils.createTitle(EnumChatFormatting.WHITE + "STORM STUNNED!", 2);
+ } else {
+ switch (block.getDamageValue(world, blockPos)) {
+ case 4:
+ Utils.createTitle(EnumChatFormatting.YELLOW + "YELLOW PILLAR!", 2);
+ break;
+ case 5:
+ Utils.createTitle(EnumChatFormatting.DARK_GREEN + "GREEN PILLAR!", 2);
+ break;
+ case 11:
+ Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "PURPLE PILLAR!", 2);
+ break;
+ default:
+ Utils.createTitle(EnumChatFormatting.WHITE + "STORM STUNNED!", 2);
+ }
}
- }
+ }
+ } else if (message.contains("I should have known that I stood no chance.")) {
+ Utils.createTitle(EnumChatFormatting.RED + "RED PILLAR!", 2);
}
- } else if (message.contains("I'VE HAD ENOUGH! YOU'RE NOT HITTING ME WITH ANY MORE PILLARS!")) {
- Utils.createTitle(EnumChatFormatting.RED + "RED PILLAR!", 2);
- } else if (message.contains("ARGH!")) {
+ } else if (message.startsWith("[BOSS] Necron:") && message.contains("ARGH!")) {
Utils.createTitle(EnumChatFormatting.RED + "EXPLOSION OVER!", 2);
}
}
-
}
}
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 15360f0..c7af0da 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -158,7 +158,7 @@ public class DankerGui extends GuiScreen {
watcherReadyMessage = new FeatureButton("Display Watcher Ready Message: " + Utils.getColouredBoolean(ToggleCommand.watcherReadyToggled), "Alerts when Watcher finishes spawning mobs.");
flowerWeapons = new FeatureButton("Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled), "Blocks placing Flower of Truth or Spirit Sceptre.");
notifySlayerSlain = new FeatureButton("Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled), "Alerts when slayer boss has been slain.");
- necronNotifications = new FeatureButton("Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled), "Creates alert on different phases of the Necron fight.");
+ necronNotifications = new FeatureButton("Floor 7 Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled), "Creates alert on different phases of the floor 7 fight.");
bonzoTimer = new FeatureButton("Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled), "Displays cooldown of Bonzo Mask ability.");
autoSkillTracker = new FeatureButton("Auto Start/Stop Skill Tracker: " + Utils.getColouredBoolean(ToggleCommand.autoSkillTrackerToggled), "Automatically pauses skill tracker when opening a gui.");
melodyTooltips = new FeatureButton("Hide tooltips in Melody's Harp: " + Utils.getColouredBoolean(ToggleCommand.melodyTooltips), "Hides tooltips in Melody's Harp.");
@@ -432,7 +432,7 @@ public class DankerGui extends GuiScreen {
} else if (button == necronNotifications) {
ToggleCommand.necronNotificationsToggled = !ToggleCommand.necronNotificationsToggled;
ConfigHandler.writeBooleanConfig("toggles", "NecronNotifications", ToggleCommand.necronNotificationsToggled);
- necronNotifications.displayString = "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled);
+ necronNotifications.displayString = "Floor 7 Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled);
} else if (button == bonzoTimer) {
ToggleCommand.bonzoTimerToggled = !ToggleCommand.bonzoTimerToggled;
ConfigHandler.writeBooleanConfig("toggles", "BonzoTimer", ToggleCommand.bonzoTimerToggled);
generated by cgit (git 2.46.0) at 2024-11-22 21:48:33 +0000