aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2022-04-23 22:46:40 -0400
committerbowser0000 <bowser0000@gmail.com>2022-04-23 22:46:40 -0400
commit9d676f89051d2845566b7253c0b91f3abe32673d (patch)
tree709bd0b41fef4bf73311133dcc054bb42fa34e8b
parent125632e4771993e5ac55dcb7e8371c18f938bad6 (diff)
downloadSkyblockMod-9d676f89051d2845566b7253c0b91f3abe32673d.tar.gz
SkyblockMod-9d676f89051d2845566b7253c0b91f3abe32673d.tar.bz2
SkyblockMod-9d676f89051d2845566b7253c0b91f3abe32673d.zip
Add fire pillar display
-rw-r--r--README.md5
-rw-r--r--src/main/java/me/Danker/DankersSkyblockMod.java1
-rw-r--r--src/main/java/me/Danker/commands/DankerGuiCommand.java1
-rw-r--r--src/main/java/me/Danker/commands/MoveCommand.java12
-rw-r--r--src/main/java/me/Danker/commands/ScaleCommand.java10
-rw-r--r--src/main/java/me/Danker/commands/ToggleCommand.java21
-rw-r--r--src/main/java/me/Danker/features/FirePillarDisplay.java51
-rw-r--r--src/main/java/me/Danker/gui/DankerGui.java7
-rw-r--r--src/main/java/me/Danker/gui/EditLocationsGui.java35
-rw-r--r--src/main/java/me/Danker/gui/buttons/LocationButton.java4
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java4
11 files changed, 124 insertions, 27 deletions
diff --git a/README.md b/README.md
index ea32b5d..30fec71 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ Discord Server: https://discord.gg/QsEkNQS
- Predicted dungeon score display
- Hide player armour
- Automatically join skyblock
+- Fire pillar display
## Commands
- /dhelp - Returns this message in-game.
@@ -75,8 +76,8 @@ Discord Server: https://discord.gg/QsEkNQS
- /loot <zombie/spider/wolf/enderman/blaze/fishing/catacombs/mythological/> [winter/festival/spooky/ch/lava/f(1-7)/mm/session] - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.
- /display <zombie/spider/wolf/enderman/blaze/fishing/catacombs/mythological/ghosts/auto/off> [winter/festival/spooky/ch/lava/f(1-7)/mm/session] - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.
- /resetloot <zombie/spider/wolf/enderman/blaze/fishing/catacombs/mythological/confirm/cancel> - - Resets loot for trackers. /resetloot confirm confirms the reset.
-- /move <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldowns/dungeonscore> <x> <y> - Moves text display to specified X and Y coordinates.
-- /scale <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldowns/dungeonscore> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x.
+- /move <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldowns/dungeonscore/firepillar> <x> <y> - Moves text display to specified X and Y coordinates.
+- /scale <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldowns/dungeonscore/firepillar> <scale (0.1 - 10)> - Scales text display to a specified multipler between 0.1x and 10x.
- /slayer [player] - Uses API to get slayer xp of a person. If no name is provided, it checks yours.
- /skill [player] - Uses API to get skill levels of a person. If no name is provided, it checks yours.
- /lobbyskills - Uses API to find the average skills of the lobby, as well the three players with the highest skill average.
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index fb98068..cc96448 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -126,6 +126,7 @@ public class DankersSkyblockMod {
MinecraftForge.EVENT_BUS.register(new EndOfFarmAlert());
MinecraftForge.EVENT_BUS.register(new ExpertiseLore());
MinecraftForge.EVENT_BUS.register(new FasterMaddoxCalling());
+ MinecraftForge.EVENT_BUS.register(new FirePillarDisplay());
MinecraftForge.EVENT_BUS.register(new GemstonesLore());
MinecraftForge.EVENT_BUS.register(new GiantHPDisplay());
MinecraftForge.EVENT_BUS.register(new GoldenEnchants());
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index 14041d1..1c5ea53 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -63,6 +63,7 @@ public class DankerGuiCommand extends CommandBase {
debug.append("[gianthp][").append(MoveCommand.giantHPXY[0]).append(", ").append(MoveCommand.giantHPXY[1]).append("]\n");
debug.append("[abilitycooldowns][").append(MoveCommand.abilityCooldownsXY[0]).append(", ").append(MoveCommand.abilityCooldownsXY[1]).append("]\n");
debug.append("[dungeonscore][").append(MoveCommand.dungeonScoreXY[0]).append(", ").append(MoveCommand.dungeonScoreXY[1]).append("]\n");
+ debug.append("[firepillar][").append(MoveCommand.firePillarXY[0]).append(", ").append(MoveCommand.firePillarXY[1]).append("]\n");
debug.append("# Other Settings\n");
debug.append("[Current Display][").append(LootDisplay.display).append("]\n");
debug.append("[Auto Display][").append(LootDisplay.auto).append("]\n");
diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index 5a6c6a2..106e603 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -27,6 +27,7 @@ public class MoveCommand extends CommandBase {
public static int[] giantHPXY = {0, 0};
public static int[] abilityCooldownsXY = {0, 0};
public static int[] dungeonScoreXY = {0, 0};
+ public static int[] firePillarXY = {0, 0};
@Override
public String getCommandName() {
@@ -37,7 +38,7 @@ public class MoveCommand extends CommandBase {
public String getCommandUsage(ICommandSender arg0) {
return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/" +
"wateranswer/bonzotimer/golemtimer/teammatesinradius/gianthp/" +
- "abilitycooldowns/dungeonscore> <x> <y>";
+ "abilitycooldowns/dungeonscore/firepillar> <x> <y>";
}
public static String usage(ICommandSender arg0) {
@@ -54,7 +55,7 @@ public class MoveCommand extends CommandBase {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer",
"skilltracker", "wateranswer", "bonzotimer", "golemtimer", "teammatesinradius",
- "gianthp", "abilitycooldowns", "dungeonscore");
+ "gianthp", "abilitycooldowns", "dungeonscore", "firepillar");
}
return null;
}
@@ -167,6 +168,13 @@ public class MoveCommand extends CommandBase {
ConfigHandler.writeIntConfig("locations", "dungeonScoreY", dungeonScoreXY[1]);
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Dungeon score has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
break;
+ case "firepillar":
+ firePillarXY[0] = Integer.parseInt(arg1[1]);
+ firePillarXY[1] = Integer.parseInt(arg1[2]);
+ ConfigHandler.writeIntConfig("locations", "firePillarX", firePillarXY[0]);
+ ConfigHandler.writeIntConfig("locations", "firePillarY", firePillarXY[1]);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Fire pillar has been moved to " + DankersSkyblockMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+ break;
default:
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
}
diff --git a/src/main/java/me/Danker/commands/ScaleCommand.java b/src/main/java/me/Danker/commands/ScaleCommand.java
index 9bb1f08..a19642b 100644
--- a/src/main/java/me/Danker/commands/ScaleCommand.java
+++ b/src/main/java/me/Danker/commands/ScaleCommand.java
@@ -27,6 +27,7 @@ public class ScaleCommand extends CommandBase {
public static double giantHPScale;
public static double abilityCooldownsScale;
public static double dungeonScoreScale;
+ public static double firePillarScale;
@Override
public String getCommandName() {
@@ -36,7 +37,7 @@ public class ScaleCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker/wateranswer/" +
- "bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldown/dungeonscore> <size (0.1 - 10)>";
+ "bonzotimer/golemtimer/teammatesinradius/gianthp/abilitycooldown/dungeonscore/firepillar> <size (0.1 - 10)>";
}
public static String usage(ICommandSender arg0) {
@@ -53,7 +54,7 @@ public class ScaleCommand extends CommandBase {
if (args.length == 1) {
return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer",
"skilltracker", "wateranswer", "bonzotimer", "golemtimer", "teammatesinradius",
- "gianthp", "abilitycooldowns", "dungeonscore");
+ "gianthp", "abilitycooldowns", "dungeonscore", "firepillar");
}
return null;
}
@@ -144,6 +145,11 @@ public class ScaleCommand extends CommandBase {
ConfigHandler.writeDoubleConfig("scales", "dungeonScoreScale", dungeonScoreScale);
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Dungeon score has been scaled to " + DankersSkyblockMod.SECONDARY_COLOUR + dungeonScoreScale + "x"));
break;
+ case "firepillar":
+ firePillarScale = scaleAmount;
+ ConfigHandler.writeDoubleConfig("scales", "firePillarScale", firePillarScale);
+ player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Fire pillar has been scaled to " + DankersSkyblockMod.SECONDARY_COLOUR + firePillarScale + "x"));
+ break;
default:
player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
}
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 3536bd7..7207565 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -32,6 +32,15 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean expertiseLoreToggled;
public static boolean skill50DisplayToggled;
public static boolean outlineTextToggled;
+ public static boolean lowHealthNotifyToggled;
+ public static boolean stopSalvageStarredToggled;
+ public static boolean watcherReadyToggled;
+ public static boolean swapToPickBlockToggled;
+ public static boolean flowerWeaponsToggled;
+ public static boolean notifySlayerSlainToggled;
+ public static boolean necronNotificationsToggled;
+ public static boolean bonzoTimerToggled;
+ public static boolean autoSkillTrackerToggled;
public static boolean cakeTimerToggled;
public static boolean highlightSlayers;
public static boolean highlightArachne;
@@ -51,6 +60,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean dungeonScore;
public static boolean hideArmour;
public static boolean autoJoinSkyblock;
+ public static boolean firePillar;
// Chat Messages
public static boolean sceptreMessages;
public static boolean midasStaffMessages;
@@ -59,16 +69,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean cooldownMessages;
public static boolean manaMessages;
public static boolean killComboMessages;
- public static boolean lowHealthNotifyToggled;
- public static boolean lividSolverToggled;
- public static boolean stopSalvageStarredToggled;
- public static boolean watcherReadyToggled;
- public static boolean swapToPickBlockToggled;
- public static boolean flowerWeaponsToggled;
- public static boolean notifySlayerSlainToggled;
- public static boolean necronNotificationsToggled;
- public static boolean bonzoTimerToggled;
- public static boolean autoSkillTrackerToggled;
// Puzzle Solvers
public static boolean threeManToggled;
public static boolean oruoToggled;
@@ -80,6 +80,7 @@ public class ToggleCommand extends CommandBase implements ICommand {
public static boolean boulderToggled;
public static boolean silverfishToggled;
public static boolean iceWalkToggled;
+ public static boolean lividSolverToggled;
// Terminal Helpers
public static boolean startsWithToggled;
public static boolean selectAllToggled;
diff --git a/src/main/java/me/Danker/features/FirePillarDisplay.java b/src/main/java/me/Danker/features/FirePillarDisplay.java
new file mode 100644
index 0000000..34b2288
--- /dev/null
+++ b/src/main/java/me/Danker/features/FirePillarDisplay.java
@@ -0,0 +1,51 @@
+package me.Danker.features;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.commands.MoveCommand;
+import me.Danker.commands.ScaleCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.events.RenderOverlayEvent;
+import me.Danker.handlers.TextRenderer;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.StringUtils;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+
+import java.util.List;
+
+public class FirePillarDisplay {
+
+ static Entity pillar = null;
+
+ @SubscribeEvent
+ public void onTick(TickEvent.ClientTickEvent event) {
+ if (event.phase != TickEvent.Phase.START) return;
+
+ World world = Minecraft.getMinecraft().theWorld;
+ if (DankersSkyblockMod.tickAmount % 20 == 0) {
+ pillar = null;
+ if (ToggleCommand.firePillar && world != null && Utils.tabLocation.equals("Crimson Isle") && Utils.isInScoreboard("Slay the boss!")) {
+ List<Entity> entities = world.getLoadedEntityList();
+
+ for (Entity entity : entities) {
+ String name = StringUtils.stripControlCodes(entity.getName());
+ if (name.endsWith(" hits") && name.charAt(1) == 's') {
+ pillar = entity;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ @SubscribeEvent
+ public void renderPlayerInfo(RenderOverlayEvent event) {
+ if (ToggleCommand.firePillar && pillar != null) {
+ new TextRenderer(Minecraft.getMinecraft(), Utils.removeBold(pillar.getName()), MoveCommand.firePillarXY[0], MoveCommand.firePillarXY[1], ScaleCommand.firePillarScale);
+ }
+ }
+
+}
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 4285d16..156a3a9 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -87,6 +87,7 @@ public class DankerGui extends GuiScreen {
private GuiButton dungeonScore;
private GuiButton hideArmour;
private GuiButton autoJoinSkyblock;
+ private GuiButton firePillar;
// Chat Messages
private GuiButton sceptreMessages;
private GuiButton midasStaffMessages;
@@ -179,6 +180,7 @@ public class DankerGui extends GuiScreen {
dungeonScore = new FeatureButton("Dungeon Score Display: " + Utils.getColouredBoolean(ToggleCommand.dungeonScore), "Displays an estimated dungeon score with secrets.");
hideArmour = new FeatureButton("Hide Player Armour: " + Utils.getColouredBoolean(ToggleCommand.hideArmour), "Makes player armour invisible, showing their skin.");
autoJoinSkyblock = new FeatureButton("Automatically Join Skyblock: " + Utils.getColouredBoolean(ToggleCommand.autoJoinSkyblock), "Automatically join Skyblock when you join Hypixel.\nYou have an addiction.");
+ firePillar = new FeatureButton("Fire Pillar Display: " + Utils.getColouredBoolean(ToggleCommand.firePillar), "Displays blaze fire pillar text on screen");
allButtons.clear();
allButtons.add(changeDisplay);
@@ -237,6 +239,7 @@ public class DankerGui extends GuiScreen {
allButtons.add(dungeonScore);
allButtons.add(hideArmour);
allButtons.add(autoJoinSkyblock);
+ allButtons.add(firePillar);
search.setText(initSearchText);
search.setVisible(true);
@@ -524,6 +527,10 @@ public class DankerGui extends GuiScreen {
ToggleCommand.autoJoinSkyblock = !ToggleCommand.autoJoinSkyblock;
ConfigHandler.writeBooleanConfig("toggles", "AutoJoinSkyblock", ToggleCommand.autoJoinSkyblock);
autoJoinSkyblock.displayString = "Automatically Join Skyblock: " + Utils.getColouredBoolean(ToggleCommand.autoJoinSkyblock);
+ } else if (button == firePillar) {
+ ToggleCommand.firePillar = !ToggleCommand.firePillar;
+ ConfigHandler.writeBooleanConfig("toggles", "FirePillar", ToggleCommand.firePillar);
+ firePillar.displayString = "Fire Pillar Display: " + Utils.getColouredBoolean(ToggleCommand.firePillar);
}
}
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index b7f4b02..24f0908 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -33,6 +33,7 @@ public class EditLocationsGui extends GuiScreen {
private LocationButton giantHP;
private LocationButton abilityCooldown;
private LocationButton dungeonScore;
+ private LocationButton firePillar;
@Override
public boolean doesGuiPauseGame() {
@@ -120,18 +121,19 @@ public class EditLocationsGui extends GuiScreen {
display = new LocationButton(MoveCommand.displayXY[0], MoveCommand.displayXY[1], ScaleCommand.displayScale, displayText, displayNums, 110);
dungeonTimer = new LocationButton(MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
- coords = new LocationButton(MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], ScaleCommand.coordsScale, NoF3Coords.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)", null, null);
- skill50 = new LocationButton(MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], ScaleCommand.skill50Scale, Skill50Display.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
- lividHP = new LocationButton(MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], ScaleCommand.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
- cakeTimer = new LocationButton(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, ScaleCommand.cakeTimerScale, CakeTimer.CAKE_COLOUR + " 11h16m", null, null);
- skillTracker = new LocationButton(MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], ScaleCommand.skillTrackerScale, skillTrackerText, null, null);
- waterAnswer = new LocationButton(MoveCommand.waterAnswerXY[0], MoveCommand.waterAnswerXY[1], ScaleCommand.waterAnswerScale, waterAnswerText, null, null);
- bonzoTimer = new LocationButton(MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1] + 5, ScaleCommand.bonzoTimerScale, BonzoMaskTimer.BONZO_COLOR + " 3m30s", null, null);
- golemTimer = new LocationButton(MoveCommand.golemTimerXY[0], MoveCommand.golemTimerXY[1] + 5, ScaleCommand.golemTimerScale, GolemSpawningAlert.GOLEM_COLOUR + " 20s", null, null);
- teammatesInRadius = new LocationButton(MoveCommand.teammatesInRadiusXY[0], MoveCommand.teammatesInRadiusXY[1], ScaleCommand.teammatesInRadiusScale, teammatesInRadiusText, null, null);
- giantHP = new LocationButton(MoveCommand.giantHPXY[0], MoveCommand.giantHPXY[1], ScaleCommand.giantHPScale, giantHPText, null, null);
- abilityCooldown = new LocationButton(MoveCommand.abilityCooldownsXY[0], MoveCommand.abilityCooldownsXY[1], ScaleCommand.abilityCooldownsScale, abilityCooldownText, null, null);
+ coords = new LocationButton(MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], ScaleCommand.coordsScale, NoF3Coords.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)");
+ skill50 = new LocationButton(MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], ScaleCommand.skill50Scale, Skill50Display.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%");
+ lividHP = new LocationButton(MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], ScaleCommand.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿");
+ cakeTimer = new LocationButton(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, ScaleCommand.cakeTimerScale, CakeTimer.CAKE_COLOUR + " 11h16m");
+ skillTracker = new LocationButton(MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], ScaleCommand.skillTrackerScale, skillTrackerText);
+ waterAnswer = new LocationButton(MoveCommand.waterAnswerXY[0], MoveCommand.waterAnswerXY[1], ScaleCommand.waterAnswerScale, waterAnswerText);
+ bonzoTimer = new LocationButton(MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1] + 5, ScaleCommand.bonzoTimerScale, BonzoMaskTimer.BONZO_COLOR + " 3m30s");
+ golemTimer = new LocationButton(MoveCommand.golemTimerXY[0], MoveCommand.golemTimerXY[1] + 5, ScaleCommand.golemTimerScale, GolemSpawningAlert.GOLEM_COLOUR + " 20s");
+ teammatesInRadius = new LocationButton(MoveCommand.teammatesInRadiusXY[0], MoveCommand.teammatesInRadiusXY[1], ScaleCommand.teammatesInRadiusScale, teammatesInRadiusText);
+ giantHP = new LocationButton(MoveCommand.giantHPXY[0], MoveCommand.giantHPXY[1], ScaleCommand.giantHPScale, giantHPText);
+ abilityCooldown = new LocationButton(MoveCommand.abilityCooldownsXY[0], MoveCommand.abilityCooldownsXY[1], ScaleCommand.abilityCooldownsScale, abilityCooldownText);
dungeonScore = new LocationButton(MoveCommand.dungeonScoreXY[0], MoveCommand.dungeonScoreXY[1], ScaleCommand.dungeonScoreScale, dungeonScoreText, dungeonScoreNums, 80);
+ firePillar = new LocationButton(MoveCommand.firePillarXY[0], MoveCommand.firePillarXY[1], ScaleCommand.firePillarScale, EnumChatFormatting.GOLD + "3s " + EnumChatFormatting.RED + "8 hits");
this.buttonList.add(coords);
this.buttonList.add(dungeonTimer);
@@ -147,6 +149,7 @@ public class EditLocationsGui extends GuiScreen {
this.buttonList.add(giantHP);
this.buttonList.add(abilityCooldown);
this.buttonList.add(dungeonScore);
+ this.buttonList.add(firePillar);
}
@Override
@@ -267,6 +270,12 @@ public class EditLocationsGui extends GuiScreen {
MoveCommand.dungeonScoreXY[1] += yMoved;
dungeonScore.xPosition = MoveCommand.dungeonScoreXY[0];
dungeonScore.yPosition = MoveCommand.dungeonScoreXY[1];
+ break;
+ case "firePillar":
+ MoveCommand.firePillarXY[0] += xMoved;
+ MoveCommand.firePillarXY[1] += yMoved;
+ firePillar.xPosition = MoveCommand.firePillarXY[0];
+ firePillar.yPosition = MoveCommand.firePillarXY[1];
}
this.buttonList.clear();
initGui();
@@ -307,6 +316,8 @@ public class EditLocationsGui extends GuiScreen {
moving = "abilityCooldown";
} else if (button == dungeonScore) {
moving = "dungeonScore";
+ } else if (button == firePillar) {
+ moving = "firePillar";
}
}
}
@@ -343,6 +354,8 @@ public class EditLocationsGui extends GuiScreen {
ConfigHandler.writeIntConfig("locations", "abilityCooldownsY", MoveCommand.abilityCooldownsXY[1]);
ConfigHandler.writeIntConfig("locations", "dungeonScoreX", MoveCommand.dungeonScoreXY[0]);
ConfigHandler.writeIntConfig("locations", "dungeonScoreY", MoveCommand.dungeonScoreXY[1]);
+ ConfigHandler.writeIntConfig("locations", "firePillarX", MoveCommand.firePillarXY[0]);
+ ConfigHandler.writeIntConfig("locations", "firePillarY", MoveCommand.firePillarXY[1]);
}
}
diff --git a/src/main/java/me/Danker/gui/buttons/LocationButton.java b/src/main/java/me/Danker/gui/buttons/LocationButton.java
index 8da1ab9..533bf83 100644
--- a/src/main/java/me/Danker/gui/buttons/LocationButton.java
+++ b/src/main/java/me/Danker/gui/buttons/LocationButton.java
@@ -44,6 +44,10 @@ public class LocationButton extends GuiButton {
this.height = (int) ((splitText.length * 9 + 3) * scale);
this.width = (int) ((this.longestText + offset + 3) * scale);
}
+
+ public LocationButton(int x, int y, double scale, String text) {
+ this(x, y, scale, text, null, null);
+ }
@Override
public void drawButton(Minecraft mc, int mouseX, int mouseY) {
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 1267b9b..5db8a17 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -244,6 +244,7 @@ public class ConfigHandler {
ToggleCommand.dungeonScore = initBoolean("toggles", "DungeonScore", false);
ToggleCommand.hideArmour = initBoolean("toggles", "HideArmour", false);
ToggleCommand.autoJoinSkyblock = initBoolean("toggles", "AutoJoinSkyblock", false);
+ ToggleCommand.firePillar = initBoolean("toggles", "FirePillar", false);
// Chat Messages
ToggleCommand.sceptreMessages = initBoolean("toggles", "SceptreMessages", true);
ToggleCommand.midasStaffMessages = initBoolean("toggles", "MidasStaffMessages", true);
@@ -629,6 +630,8 @@ public class ConfigHandler {
MoveCommand.abilityCooldownsXY[1] = initInt("locations", "abilityCooldownsY", 150);
MoveCommand.dungeonScoreXY[0] = initInt("locations", "dungeonScoreX", 150);
MoveCommand.dungeonScoreXY[1] = initInt("locations", "dungeonScoreY", 150);
+ MoveCommand.firePillarXY[0] = initInt("locations", "firePillarX", 200);
+ MoveCommand.firePillarXY[1] = initInt("locations", "firePillarY", 200);
// Scales
ScaleCommand.coordsScale = initDouble("scales", "coordsScale", 1);
@@ -645,6 +648,7 @@ public class ConfigHandler {
ScaleCommand.giantHPScale = initDouble("scales", "giantHPScale", 1);
ScaleCommand.abilityCooldownsScale = initDouble("scales", "abilityCooldownsScale", 1);
ScaleCommand.dungeonScoreScale = initDouble("scales", "dungeonScoreScale", 1);
+ ScaleCommand.firePillarScale = initDouble("scales", "firePillarScale", 1);
// Skills
DankersSkyblockMod.farmingLevel = initInt("skills", "farming", -1);