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.java38
-rw-r--r--src/main/java/me/Danker/gui/EditLocationsGui.java32
2 files changed, 60 insertions, 10 deletions
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 5b9a452..b91ed3e 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -62,6 +62,9 @@ public class DankerGui extends GuiScreen {
private GuiButton flowerWeapons;
private GuiButton pickBlock;
private GuiButton notifySlayerSlain;
+ private GuiButton necronNotifications;
+ private GuiButton bonzoTimer;
+ private GuiButton blockBreakingFarms;
public DankerGui(int page) {
this.page = page;
@@ -120,13 +123,19 @@ public class DankerGui extends GuiScreen {
rngesusAlert = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "RNGesus Alerts: " + Utils.getColouredBoolean(ToggleCommand.rngesusAlerts));
splitFishing = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Split Fishing Display: " + Utils.getColouredBoolean(ToggleCommand.splitFishing));
// Page 5
- lowHealthNotify = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Low Health Notifications: " + Utils.getColouredBoolean(ToggleCommand.lowHealthNotifyToggled));
+ lowHealthNotify = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Low Health Notifications: " + Utils.getColouredBoolean(ToggleCommand.lowHealthNotifyToggled));
lividSolver = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Find Correct Livid: " + Utils.getColouredBoolean(ToggleCommand.lividSolverToggled));
dungeonTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Display Dungeon Timers: " + Utils.getColouredBoolean(ToggleCommand.dungeonTimerToggled));
stopSalvageStarred = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Stop Salvaging Starred Items: " + Utils.getColouredBoolean(ToggleCommand.stopSalvageStarredToggled));
watcherReadyMessage = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Display Watcher Ready Message: " + Utils.getColouredBoolean(ToggleCommand.watcherReadyToggled));
- notifySlayerSlain = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled));
- flowerWeapons = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled));
+ splitFishing = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Split Fishing Display: " + Utils.getColouredBoolean(ToggleCommand.splitFishing));
+ notifySlayerSlain = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled));
+ //Page 6
+ flowerWeapons = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled));
+ necronNotifications = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled));
+ bonzoTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled));
+ blockBreakingFarms = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Prevent Breaking Farms: " + Utils.getColouredBoolean(ToggleCommand.blockBreakingFarmsToggled));
+
switch (page) {
case 1:
this.buttonList.add(changeDisplay);
@@ -178,7 +187,14 @@ public class DankerGui extends GuiScreen {
this.buttonList.add(stopSalvageStarred);
this.buttonList.add(watcherReadyMessage);
this.buttonList.add(notifySlayerSlain);
- this.buttonList.add(flowerWeapons);
+ this.buttonList.add(flowerWeapons);
+ this.buttonList.add(nextPage);
+ this.buttonList.add(backPage);
+ break;
+ case 6:
+ this.buttonList.add(necronNotifications);
+ this.buttonList.add(bonzoTimer);
+ this.buttonList.add(blockBreakingFarms);
this.buttonList.add(backPage);
break;
}
@@ -191,7 +207,7 @@ public class DankerGui extends GuiScreen {
@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();
- String pageText = "Page: " + page + "/5";
+ String pageText = "Page: " + page + "/6";
int pageWidth = mc.fontRendererObj.getStringWidth(pageText);
new TextRenderer(mc, pageText, width / 2 - pageWidth / 2, 10, 1D);
super.drawScreen(mouseX, mouseY, partialTicks);
@@ -339,6 +355,18 @@ public class DankerGui extends GuiScreen {
ToggleCommand.notifySlayerSlainToggled = !ToggleCommand.notifySlayerSlainToggled;
ConfigHandler.writeBooleanConfig("toggles", "NotifySlayerSlain", ToggleCommand.notifySlayerSlainToggled);
notifySlayerSlain.displayString = "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled);
+ } else if (button == necronNotifications) {
+ ToggleCommand.necronNotificationsToggled = !ToggleCommand.necronNotificationsToggled;
+ ConfigHandler.writeBooleanConfig("toggles", "NecronNotifications", ToggleCommand.necronNotificationsToggled);
+ necronNotifications.displayString = "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled);
+ } else if (button == bonzoTimer) {
+ 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);
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index b610ae0..e3d6b73 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -26,6 +26,7 @@ public class EditLocationsGui extends GuiScreen {
private LocationButton cakeTimer;
private LocationButton skillTracker;
private LocationButton waterAnswer;
+ private LocationButton bonzoTimer;
@Override
public boolean doesGuiPauseGame() {
@@ -91,6 +92,8 @@ public class EditLocationsGui extends GuiScreen {
cakeTimer = new LocationButton(0, MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, 85 * ScaleCommand.cakeTimerScale, 18 * ScaleCommand.cakeTimerScale, ScaleCommand.cakeTimerScale, DankersSkyblockMod.CAKE_COLOUR + " 11h16m", null, null);
skillTracker = new LocationButton(0, MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], 150 * ScaleCommand.skillTrackerScale, 28 * ScaleCommand.skillTrackerScale, ScaleCommand.skillTrackerScale, skillTrackerText, null, null);
waterAnswer = new LocationButton(0, MoveCommand.waterAnswerXY[0], MoveCommand.waterAnswerXY[1], 190 * ScaleCommand.waterAnswerScale, 54 * ScaleCommand.waterAnswerScale, ScaleCommand.waterAnswerScale, waterAnswerText, null, null);
+ bonzoTimer = new LocationButton(0, MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1] + 5, 85 * ScaleCommand.bonzoTimerScale, 18 * ScaleCommand.bonzoTimerScale, ScaleCommand.bonzoTimerScale, DankersSkyblockMod.BONZO_COLOR + " 3m30s", null, null);
+
this.buttonList.add(coords);
this.buttonList.add(dungeonTimer);
@@ -98,6 +101,7 @@ public class EditLocationsGui extends GuiScreen {
this.buttonList.add(cakeTimer);
this.buttonList.add(skillTracker);
this.buttonList.add(waterAnswer);
+ this.buttonList.add(bonzoTimer);
this.buttonList.add(display);
this.buttonList.add(skill50);
}
@@ -107,13 +111,21 @@ public class EditLocationsGui extends GuiScreen {
this.drawDefaultBackground();
mouseMoved(mouseX, mouseY);
- double scale = ScaleCommand.cakeTimerScale;
- double scaleReset = Math.pow(scale, -1);
- GL11.glScaled(scale, scale, scale);
+ double cakeTimerScale = ScaleCommand.cakeTimerScale;
+ double cakeTimerScaleReset = Math.pow(cakeTimerScale, -1);
+ GL11.glScaled(cakeTimerScale, cakeTimerScale, cakeTimerScale);
mc.getTextureManager().bindTexture(DankersSkyblockMod.CAKE_ICON);
Gui.drawModalRectWithCustomSizedTexture(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1], 0, 0, 16, 16, 16, 16);
- GL11.glScaled(scaleReset, scaleReset, scaleReset);
-
+ GL11.glScaled(cakeTimerScaleReset, cakeTimerScaleReset, cakeTimerScaleReset);
+
+ double bonzoTimerScale = ScaleCommand.bonzoTimerScale;
+ double bonzoTimerScaleReset = Math.pow(bonzoTimerScale, -1);
+ GL11.glScaled(bonzoTimerScale, bonzoTimerScale, bonzoTimerScale);
+ mc.getTextureManager().bindTexture(DankersSkyblockMod.BONZO_ICON);
+ Gui.drawModalRectWithCustomSizedTexture(MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1], 0, 0, 16, 16, 16, 16);
+ GL11.glScaled(bonzoTimerScaleReset, bonzoTimerScaleReset, bonzoTimerScaleReset);
+
+
super.drawScreen(mouseX, mouseY, partialTicks);
}
@@ -171,6 +183,12 @@ public class EditLocationsGui extends GuiScreen {
waterAnswer.xPosition = MoveCommand.waterAnswerXY[0];
waterAnswer.yPosition = MoveCommand.waterAnswerXY[1];
break;
+ case "bonzoTimer":
+ MoveCommand.bonzoTimerXY[0] += xMoved;
+ MoveCommand.bonzoTimerXY[1] += yMoved;
+ bonzoTimer.xPosition = MoveCommand.bonzoTimerXY[0];
+ bonzoTimer.yPosition = MoveCommand.bonzoTimerXY[1];
+ break;
}
this.buttonList.clear();
initGui();
@@ -199,6 +217,8 @@ public class EditLocationsGui extends GuiScreen {
moving = "skillTracker";
} else if (button == waterAnswer) {
moving = "waterAnswer";
+ } else if (button == bonzoTimer) {
+ moving = "bonzoTimer";
}
}
}
@@ -223,6 +243,8 @@ public class EditLocationsGui extends GuiScreen {
ConfigHandler.writeIntConfig("locations", "skillTrackerY", MoveCommand.skillTrackerXY[1]);
ConfigHandler.writeIntConfig("locations", "waterAnswerX", MoveCommand.waterAnswerXY[0]);
ConfigHandler.writeIntConfig("locations", "waterAnswerY", MoveCommand.waterAnswerXY[1]);
+ ConfigHandler.writeIntConfig("locations", "bonzoTimerX", MoveCommand.bonzoTimerXY[0]);
+ ConfigHandler.writeIntConfig("locations", "bonzoTimerY", MoveCommand.bonzoTimerXY[1]);
}
}
generated by cgit (git 2.46.0) at 2024-12-13 16:58:57 +0000