aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/Danker/gui')
-rw-r--r--src/main/java/me/Danker/gui/DankerGui.java47
-rw-r--r--src/main/java/me/Danker/gui/OnlySlayerGui.java165
-rw-r--r--src/main/java/me/Danker/gui/PuzzleSolversGui.java14
3 files changed, 7 insertions, 219 deletions
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index d8100b5..569f4d1 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -35,7 +35,6 @@ public class DankerGui extends GuiScreen {
private GuiTextField search;
private GuiButton changeDisplay;
- private GuiButton onlySlayer;
private GuiButton puzzleSolvers;
private GuiButton experimentationTableSolvers;
private GuiButton skillTracker;
@@ -49,7 +48,6 @@ public class DankerGui extends GuiScreen {
private GuiButton splitFishing;
private GuiButton chatMaddox;
private GuiButton spiritBearAlert;
- private GuiButton aotd;
private GuiButton petColours;
private GuiButton golemAlerts;
private GuiButton expertiseLore;
@@ -58,13 +56,11 @@ public class DankerGui extends GuiScreen {
private GuiButton cakeTimer;
private GuiButton pickBlock;
private GuiButton notifySlayerSlain;
- private GuiButton shadowFury;
- private GuiButton specialHoe;
private GuiButton melodyTooltips;
private GuiButton autoSkillTracker;
private GuiButton highlightArachne;
+ private GuiButton highlightSlayer;
// Chat Messages
- private GuiButton lividDagger;
private GuiButton sceptreMessages;
private GuiButton midasStaffMessages;
private GuiButton implosionMessages;
@@ -78,7 +74,6 @@ public class DankerGui extends GuiScreen {
private GuiButton lividSolver;
private GuiButton stopSalvageStarred;
private GuiButton watcherReadyMessage;
- private GuiButton flowerWeapons;
private GuiButton necronNotifications;
private GuiButton bonzoTimer;
@@ -110,7 +105,6 @@ public class DankerGui extends GuiScreen {
search = new GuiTextField(0, this.fontRendererObj, width - 202, 5, 200, 20);
changeDisplay = new GuiButton(0, 0, 0, "Change Display Settings");
- onlySlayer = new GuiButton(0, 0, 0, "Set Slayer Quest");
puzzleSolvers = new GuiButton(0, 0, 0, "Toggle Dungeons Puzzle Solvers");
experimentationTableSolvers = new GuiButton(0, 0, 0, "Toggle Experimentation Table Solvers");
skillTracker = new GuiButton(0, 0, 0, "Toggle Skill XP/Hour Tracking");
@@ -122,8 +116,6 @@ public class DankerGui extends GuiScreen {
cakeTimer = new GuiButton(0, 0, 0, "Cake Timer: " + Utils.getColouredBoolean(ToggleCommand.cakeTimerToggled));
skill50Display = new GuiButton(0, 0, 0, "Display Progress To Skill Level 50: " + Utils.getColouredBoolean(ToggleCommand.skill50DisplayToggled));
slayerCount = new GuiButton(0, 0, 0, "Count Total 20% Drops: " + Utils.getColouredBoolean(ToggleCommand.slayerCountTotal));
- aotd = new GuiButton(0, 0, 0, "Disable AOTD Ability: " + Utils.getColouredBoolean(ToggleCommand.aotdToggled));
- lividDagger = new GuiButton(0, 0, 0, "Disable Livid Dagger Ability: " + Utils.getColouredBoolean(ToggleCommand.lividDaggerToggled));
spiritBearAlert = new GuiButton(0, 0, 0, "Spirit Bear Spawn Alerts: " + Utils.getColouredBoolean(ToggleCommand.spiritBearAlerts));
sceptreMessages = new GuiButton(0, 0, 0, "Spirit Sceptre Messages: " + Utils.getColouredBoolean(ToggleCommand.sceptreMessages));
midasStaffMessages = new GuiButton(0, 0, 0, "Midas Staff Messages: " + Utils.getColouredBoolean(ToggleCommand.midasStaffMessages));
@@ -144,18 +136,15 @@ public class DankerGui extends GuiScreen {
dungeonTimer = new GuiButton(0, 0, 0, "Display Dungeon Timers: " + Utils.getColouredBoolean(ToggleCommand.dungeonTimerToggled));
stopSalvageStarred = new GuiButton(0, 0, 0, "Stop Salvaging Starred Items: " + Utils.getColouredBoolean(ToggleCommand.stopSalvageStarredToggled));
watcherReadyMessage = new GuiButton(0, 0, 0, "Display Watcher Ready Message: " + Utils.getColouredBoolean(ToggleCommand.watcherReadyToggled));
- flowerWeapons = new GuiButton(0, 0, 0, "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled));
notifySlayerSlain = new GuiButton(0, 0, 0, "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled));
necronNotifications = new GuiButton(0, 0, 0, "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled));
bonzoTimer = new GuiButton(0, 0, 0, "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled));
autoSkillTracker = new GuiButton(0, 0, 0, "Auto Start/Stop Skill Tracker: " + Utils.getColouredBoolean(ToggleCommand.autoSkillTrackerToggled));
- shadowFury = new GuiButton(0, 0, 0, "Block Shadow Fury ability: " + Utils.getColouredBoolean(ToggleCommand.shadowFuryToggled));
- specialHoe = new GuiButton(0, 0, 0, "Block Special Hoe right click: " + Utils.getColouredBoolean(ToggleCommand.specialHoeRightClick));
melodyTooltips = new GuiButton(0, 0, 0, "Hide tooltips in Melody's Harp: " + Utils.getColouredBoolean(ToggleCommand.melodyTooltips));
highlightArachne = new GuiButton(0, 0, 0, "Highlight Arachne: " + Utils.getColouredBoolean(ToggleCommand.highlightArachne));
+ highlightSlayer = new GuiButton(0, 0, 0, "Highlight Slayer: " + Utils.getColouredBoolean(ToggleCommand.highlightSlayers));
allButtons.add(changeDisplay);
- allButtons.add(onlySlayer);
allButtons.add(puzzleSolvers);
allButtons.add(experimentationTableSolvers);
allButtons.add(skillTracker);
@@ -167,8 +156,6 @@ public class DankerGui extends GuiScreen {
allButtons.add(cakeTimer);
allButtons.add(skill50Display);
allButtons.add(slayerCount);
- allButtons.add(aotd);
- allButtons.add(lividDagger);
allButtons.add(spiritBearAlert);
allButtons.add(sceptreMessages);
allButtons.add(midasStaffMessages);
@@ -189,15 +176,13 @@ public class DankerGui extends GuiScreen {
allButtons.add(dungeonTimer);
allButtons.add(stopSalvageStarred);
allButtons.add(watcherReadyMessage);
- allButtons.add(flowerWeapons);
allButtons.add(notifySlayerSlain);
allButtons.add(necronNotifications);
allButtons.add(bonzoTimer);
allButtons.add(autoSkillTracker);
- allButtons.add(shadowFury);
- allButtons.add(specialHoe);
allButtons.add(melodyTooltips);
allButtons.add(highlightArachne);
+ allButtons.add(highlightSlayer);
search.setText(initSearchText);
search.setVisible(true);
@@ -273,8 +258,6 @@ public class DankerGui extends GuiScreen {
}
} else if (button == changeDisplay) {
DankersSkyblockMod.guiToOpen = "displaygui";
- } else if (button == onlySlayer) {
- DankersSkyblockMod.guiToOpen = "onlyslayergui";
} else if (button == puzzleSolvers) {
DankersSkyblockMod.guiToOpen = "puzzlesolvers";
} else if (button == experimentationTableSolvers) {
@@ -303,14 +286,6 @@ public class DankerGui extends GuiScreen {
ToggleCommand.slayerCountTotal = !ToggleCommand.slayerCountTotal;
ConfigHandler.writeBooleanConfig("toggles", "SlayerCount", ToggleCommand.slayerCountTotal);
slayerCount.displayString = "Count Total 20% Drops: " + Utils.getColouredBoolean(ToggleCommand.slayerCountTotal);
- } else if (button == aotd) {
- ToggleCommand.aotdToggled = !ToggleCommand.aotdToggled;
- ConfigHandler.writeBooleanConfig("toggles", "AOTD", ToggleCommand.aotdToggled);
- aotd.displayString = "Disable AOTD Ability: " + Utils.getColouredBoolean(ToggleCommand.aotdToggled);
- } else if (button == lividDagger) {
- ToggleCommand.lividDaggerToggled = !ToggleCommand.lividDaggerToggled;
- ConfigHandler.writeBooleanConfig("toggles", "LividDagger", ToggleCommand.lividDaggerToggled);
- lividDagger.displayString = "Disable Livid Dagger Ability: " + Utils.getColouredBoolean(ToggleCommand.lividDaggerToggled);
} else if (button == sceptreMessages) {
ToggleCommand.sceptreMessages = !ToggleCommand.sceptreMessages;
ConfigHandler.writeBooleanConfig("toggles", "SceptreMessages", ToggleCommand.sceptreMessages);
@@ -407,22 +382,10 @@ public class DankerGui extends GuiScreen {
ToggleCommand.swapToPickBlockToggled = !ToggleCommand.swapToPickBlockToggled;
ConfigHandler.writeBooleanConfig("toggles", "PickBlock", ToggleCommand.swapToPickBlockToggled);
pickBlock.displayString = "Auto-Swap to Pick Block: " + Utils.getColouredBoolean(ToggleCommand.swapToPickBlockToggled);
- } else if (button == flowerWeapons) {
- ToggleCommand.flowerWeaponsToggled = !ToggleCommand.flowerWeaponsToggled;
- ConfigHandler.writeBooleanConfig("toggles", "FlowerWeapons", ToggleCommand.flowerWeaponsToggled);
- flowerWeapons.displayString = "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled);
} else if (button == autoSkillTracker) {
ToggleCommand.autoSkillTrackerToggled = !ToggleCommand.autoSkillTrackerToggled;
ConfigHandler.writeBooleanConfig("toggles", "AutoSkillTracker", ToggleCommand.autoSkillTrackerToggled);
autoSkillTracker.displayString = "Auto Start/Stop Skill Tracker: " + Utils.getColouredBoolean(ToggleCommand.autoSkillTrackerToggled);
- } else if (button == shadowFury) {
- ToggleCommand.shadowFuryToggled = !ToggleCommand.shadowFuryToggled;
- ConfigHandler.writeBooleanConfig("toggles", "ShadowFury", ToggleCommand.shadowFuryToggled);
- shadowFury.displayString = "Block Shadow Fury ability: " + Utils.getColouredBoolean(ToggleCommand.shadowFuryToggled);
- } else if (button == specialHoe) {
- ToggleCommand.specialHoeRightClick = !ToggleCommand.specialHoeRightClick;
- ConfigHandler.writeBooleanConfig("toggles", "SpecialHoe", ToggleCommand.specialHoeRightClick);
- specialHoe.displayString = "Block Special Hoe right click: " + Utils.getColouredBoolean(ToggleCommand.specialHoeRightClick);
} else if (button == melodyTooltips) {
ToggleCommand.melodyTooltips = !ToggleCommand.melodyTooltips;
ConfigHandler.writeBooleanConfig("toggles", "MelodyTooltips", ToggleCommand.melodyTooltips);
@@ -435,6 +398,10 @@ public class DankerGui extends GuiScreen {
ToggleCommand.highlightArachne = !ToggleCommand.highlightArachne;
ConfigHandler.writeBooleanConfig("toggles", "HighlightArachne", ToggleCommand.highlightArachne);
highlightArachne.displayString = "Highlight Arachne: " + Utils.getColouredBoolean(ToggleCommand.highlightArachne);
+ } else if (button == highlightSlayer) {
+ ToggleCommand.highlightSlayers = !ToggleCommand.highlightSlayers;
+ ConfigHandler.writeBooleanConfig("toggles", "HighlightSlayers", ToggleCommand.highlightSlayers);
+ highlightSlayer.displayString = "Highlight Slayer: " + Utils.getColouredBoolean(ToggleCommand.highlightSlayers);
}
}
diff --git a/src/main/java/me/Danker/gui/OnlySlayerGui.java b/src/main/java/me/Danker/gui/OnlySlayerGui.java
deleted file mode 100644
index ec26a13..0000000
--- a/src/main/java/me/Danker/gui/OnlySlayerGui.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package me.Danker.gui;
-
-import me.Danker.DankersSkyblockMod;
-import me.Danker.commands.ToggleCommand;
-import me.Danker.features.BlockWrongSlayer;
-import me.Danker.handlers.ConfigHandler;
-import me.Danker.handlers.TextRenderer;
-import me.Danker.utils.Utils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.ScaledResolution;
-
-public class OnlySlayerGui extends GuiScreen {
-
- private int onlyNumberInt = 4;
- private String onlyName = "Revenant Horror";
-
- private GuiButton goBack;
- private GuiButton off;
- private GuiButton zombie;
- private GuiButton spider;
- private GuiButton wolf;
- private GuiButton one;
- private GuiButton two;
- private GuiButton three;
- private GuiButton four;
- private GuiButton five;
- private GuiButton highlightSlayers;
-
- @Override
- public boolean doesGuiPauseGame() {
- return false;
- }
-
- @Override
- public void initGui() {
- super.initGui();
-
- ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());
- int height = sr.getScaledHeight();
- int width = sr.getScaledWidth();
-
- onlyName = BlockWrongSlayer.onlySlayerName;
- switch (BlockWrongSlayer.onlySlayerNumber) {
- case "I":
- onlyNumberInt = 1;
- break;
- case "II":
- onlyNumberInt = 2;
- break;
- case "III":
- onlyNumberInt = 3;
- break;
- case "IV":
- default:
- onlyNumberInt = 4;
- break;
- case "V":
- onlyNumberInt = 5;
- break;
- }
-
- goBack = new GuiButton(0, 2, height - 30, 100, 20, "Go Back");
- off = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Off");
- zombie = new GuiButton(0, width / 2 - 200, (int) (height * 0.4), 120, 20, "Zombie");
- spider = new GuiButton(0, width / 2 - 60, (int) (height * 0.4), 120, 20, "Spider");
- wolf = new GuiButton(0, width / 2 + 80, (int) (height * 0.4), 120, 20, "Wolf");
- one = new GuiButton(0, width / 2 - 190, (int) (height * 0.6), 60, 20, "I");
- two = new GuiButton(0, width / 2 - 110, (int) (height * 0.6), 60, 20, "II");
- three = new GuiButton(0, width / 2 - 30, (int) (height * 0.6), 60, 20, "III");
- four = new GuiButton(0, width / 2 + 50, (int) (height * 0.6), 60, 20, "IV");
- five = new GuiButton(0, width / 2 + 130, (int) (height * 0.6), 60, 20, "V");
- highlightSlayers = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Highlight Slayer Bosses: " + Utils.getColouredBoolean(ToggleCommand.highlightSlayers));
-
- this.buttonList.add(off);
- this.buttonList.add(zombie);
- this.buttonList.add(spider);
- this.buttonList.add(wolf);
- this.buttonList.add(one);
- this.buttonList.add(two);
- this.buttonList.add(three);
- this.buttonList.add(four);
- this.buttonList.add(five);
- this.buttonList.add(highlightSlayers);
- this.buttonList.add(goBack);
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- Minecraft mc = Minecraft.getMinecraft();
-
- String displayText;
- if (BlockWrongSlayer.onlySlayerName.equals("")) {
- displayText = "Only Allow Slayer: Off";
- } else {
- displayText = "Only Allow Slayer: " + BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber;
- }
- int displayWidth = mc.fontRendererObj.getStringWidth(displayText);
- new TextRenderer(mc, displayText, width / 2 - displayWidth / 2, 10, 1D);
-
- super.drawScreen(mouseX, mouseY, partialTicks);
- }
-
- @Override
- public void actionPerformed(GuiButton button) {
- if (button == goBack) {
- DankersSkyblockMod.guiToOpen = "dankergui1";
- return;
- } else if (button == off) {
- BlockWrongSlayer.onlySlayerName = "";
- BlockWrongSlayer.onlySlayerNumber = "";
- ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
- return;
- } else if (button == zombie) {
- onlyName = "Revenant Horror";
- } else if (button == spider) {
- onlyName = "Tarantula Broodfather";
- } else if (button == wolf) {
- onlyName = "Sven Packmaster";
- } else if (button == one) {
- onlyNumberInt = 1;
- } else if (button == two) {
- onlyNumberInt = 2;
- } else if (button == three) {
- onlyNumberInt = 3;
- } else if (button == four) {
- onlyNumberInt = 4;
- } else if (button == five) {
- onlyNumberInt = 5;
- } else if (button == highlightSlayers) {
- ToggleCommand.highlightSlayers = !ToggleCommand.highlightSlayers;
- ConfigHandler.writeBooleanConfig("toggles", "HighlightSlayers", ToggleCommand.highlightSlayers);
- highlightSlayers.displayString = "Highlight Slayer Bosses: " + Utils.getColouredBoolean(ToggleCommand.highlightSlayers);
- return;
- }
-
- String onlyNumber;
- switch (onlyNumberInt) {
- case 1:
- onlyNumber = "I";
- break;
- case 2:
- onlyNumber = "II";
- break;
- case 3:
- onlyNumber = "III";
- break;
- case 4:
- onlyNumber = "IV";
- break;
- case 5:
- onlyNumber = "V";
- break;
- default:
- onlyNumber = "IV";
- }
-
- BlockWrongSlayer.onlySlayerName = onlyName;
- BlockWrongSlayer.onlySlayerNumber = onlyNumber;
- ConfigHandler.writeStringConfig("toggles", "BlockSlayer", BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber);
- }
-
-}
diff --git a/src/main/java/me/Danker/gui/PuzzleSolversGui.java b/src/main/java/me/Danker/gui/PuzzleSolversGui.java
index 3bb16a0..70cd982 100644
--- a/src/main/java/me/Danker/gui/PuzzleSolversGui.java
+++ b/src/main/java/me/Danker/gui/PuzzleSolversGui.java
@@ -28,8 +28,6 @@ public class PuzzleSolversGui extends GuiScreen {
private GuiButton startsWith;
private GuiButton selectAll;
private GuiButton clickOrder;
- private GuiButton blockClicks;
- private GuiButton itemFrameOnSeaLanterns;
public PuzzleSolversGui(int page) {
this.page = page;
@@ -66,8 +64,6 @@ public class PuzzleSolversGui extends GuiScreen {
startsWith = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Starts With Letter Terminal Solver: " + Utils.getColouredBoolean(ToggleCommand.startsWithToggled));
selectAll = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Select All Color Terminal Solver: " + Utils.getColouredBoolean(ToggleCommand.selectAllToggled));
clickOrder = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Click in Order Terminal Helper: " + Utils.getColouredBoolean(ToggleCommand.clickInOrderToggled));
- blockClicks = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Block Wrong Clicks on Terminals: " + Utils.getColouredBoolean(ToggleCommand.blockWrongTerminalClicksToggled));
- itemFrameOnSeaLanterns = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Ignore Arrows On Sea Lanterns: " + Utils.getColouredBoolean(ToggleCommand.itemFrameOnSeaLanternsToggled));
switch (page) {
case 1:
@@ -86,8 +82,6 @@ public class PuzzleSolversGui extends GuiScreen {
this.buttonList.add(startsWith);
this.buttonList.add(selectAll);
this.buttonList.add(clickOrder);
- this.buttonList.add(blockClicks);
- this.buttonList.add(itemFrameOnSeaLanterns);
this.buttonList.add(backPage);
break;
}
@@ -156,14 +150,6 @@ public class PuzzleSolversGui extends GuiScreen {
ToggleCommand.clickInOrderToggled = !ToggleCommand.clickInOrderToggled;
ConfigHandler.writeBooleanConfig("toggles", "ClickInOrderTerminal", ToggleCommand.clickInOrderToggled);
clickOrder.displayString = "Click in Order Terminal Helper: " + Utils.getColouredBoolean(ToggleCommand.clickInOrderToggled);
- } else if (button == blockClicks) {
- ToggleCommand.blockWrongTerminalClicksToggled = !ToggleCommand.blockWrongTerminalClicksToggled;
- ConfigHandler.writeBooleanConfig("toggles", "BlockWrongTerminalClicks", ToggleCommand.blockWrongTerminalClicksToggled);
- blockClicks.displayString = "Block Wrong Clicks on Terminals: " + Utils.getColouredBoolean(ToggleCommand.blockWrongTerminalClicksToggled);
- } else if (button == itemFrameOnSeaLanterns) {
- ToggleCommand.itemFrameOnSeaLanternsToggled = !ToggleCommand.itemFrameOnSeaLanternsToggled;
- ConfigHandler.writeBooleanConfig("toggles", "IgnoreItemFrameOnSeaLanterns", ToggleCommand.itemFrameOnSeaLanternsToggled);
- itemFrameOnSeaLanterns.displayString = "Ignore Arrows On Sea Lanterns: " + Utils.getColouredBoolean(ToggleCommand.itemFrameOnSeaLanternsToggled);
}
}