diff options
| author | RabbitType99 <luis.be@gmx.de> | 2021-02-26 23:25:07 +0100 |
|---|---|---|
| committer | RabbitType99 <luis.be@gmx.de> | 2021-02-26 23:25:07 +0100 |
| commit | 87f5d4c76b907da4fb5952e7dff5ebad88b080d8 (patch) | |
| tree | 9f15f6e94a3b785527b3ea772f8978f32fcb7746 /src/main/java/me/Danker/gui | |
| parent | c74359fb758b6320cd7bea11ef07d2a55367713f (diff) | |
| parent | a2f85ba6b9d80be3026aa906783a21c0b05cb681 (diff) | |
| download | SkyblockMod-87f5d4c76b907da4fb5952e7dff5ebad88b080d8.tar.gz SkyblockMod-87f5d4c76b907da4fb5952e7dff5ebad88b080d8.tar.bz2 SkyblockMod-87f5d4c76b907da4fb5952e7dff5ebad88b080d8.zip | |
Merge branch 'development' into InstallerFrame
# Conflicts:
# build.gradle
Diffstat (limited to 'src/main/java/me/Danker/gui')
| -rw-r--r-- | src/main/java/me/Danker/gui/DankerGui.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java index 57d0292..90aa5e5 100644 --- a/src/main/java/me/Danker/gui/DankerGui.java +++ b/src/main/java/me/Danker/gui/DankerGui.java @@ -65,7 +65,6 @@ public class DankerGui extends GuiScreen { private GuiButton notifySlayerSlain; private GuiButton necronNotifications; private GuiButton bonzoTimer; - private GuiButton blockBreakingFarms; private GuiButton autoSkillTracker; public DankerGui(int page) { @@ -136,8 +135,7 @@ public class DankerGui extends GuiScreen { //Page 6 necronNotifications = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled)); bonzoTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled)); - blockBreakingFarms = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Prevent Breaking Farms: " + Utils.getColouredBoolean(ToggleCommand.blockBreakingFarmsToggled)); - autoSkillTracker = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Auto Start/Stop Skill Tracker: " + Utils.getColouredBoolean(ToggleCommand.autoSkillTrackerToggled)); + autoSkillTracker = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Auto Start/Stop Skill Tracker: " + Utils.getColouredBoolean(ToggleCommand.autoSkillTrackerToggled)); switch (page) { case 1: @@ -195,9 +193,8 @@ public class DankerGui extends GuiScreen { this.buttonList.add(backPage); break; case 6: - this.buttonList.add(necronNotifications); + this.buttonList.add(necronNotifications); this.buttonList.add(bonzoTimer); - this.buttonList.add(blockBreakingFarms); this.buttonList.add(autoSkillTracker); this.buttonList.add(backPage); break; @@ -370,10 +367,6 @@ public class DankerGui extends GuiScreen { ToggleCommand.bonzoTimerToggled = !ToggleCommand.bonzoTimerToggled; ConfigHandler.writeBooleanConfig("toggles", "BonzoTimer", ToggleCommand.bonzoTimerToggled); bonzoTimer.displayString = "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled); - } else if (button == blockBreakingFarms) { - ToggleCommand.blockBreakingFarmsToggled = !ToggleCommand.blockBreakingFarmsToggled; - ConfigHandler.writeBooleanConfig("toggles", "BlockBreakingFarms", ToggleCommand.blockBreakingFarmsToggled); - blockBreakingFarms.displayString = "Prevent Breaking Farms: " + Utils.getColouredBoolean(ToggleCommand.blockBreakingFarmsToggled); } else if (button == pickBlock) { ToggleCommand.swapToPickBlockToggled = !ToggleCommand.swapToPickBlockToggled; ConfigHandler.writeBooleanConfig("toggles", "PickBlock", ToggleCommand.swapToPickBlockToggled); |