aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTymanWasTaken <tyman@tyman.tech>2021-07-06 17:20:49 -0400
committerTymanWasTaken <tyman@tyman.tech>2021-07-06 17:20:49 -0400
commitc04ca523f9fb9f7adefa74587db61f76deeae9f0 (patch)
treef148e7bcd9105813d3fe781badcb2cf3892712fd /src/main/java
parenta8e475fa0a7977f64f072548459d592274169d66 (diff)
downloadSkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.tar.gz
SkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.tar.bz2
SkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.zip
Increase line width
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java174
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java65
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java40
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java40
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/Utils.java134
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java53
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java36
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java32
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java158
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java458
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java88
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java40
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java19
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java29
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java350
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java302
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java22
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java42
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java29
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java9
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java19
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java101
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java72
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java26
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java113
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java127
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java87
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java41
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java5
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java193
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java69
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java54
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java12
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java65
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java24
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java168
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java27
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java21
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java27
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java12
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java13
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java43
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java13
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java20
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java9
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java210
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java92
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java129
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java262
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java59
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java88
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java36
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java10
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java116
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java75
73 files changed, 867 insertions, 3929 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
index 28c5485..b0c17be 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
@@ -21,12 +21,7 @@ public class ComponentBuilder {
}
public ComponentBuilder apd(String text, char color) {
- builder
- .append("\u00A7")
- .append(color)
- .append(text)
- .append("\u00A7")
- .append('r');
+ builder.append("\u00A7").append(color).append(text).append("\u00A7").append('r');
return this;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
index ef2028d..0f4713f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -22,12 +22,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ComponentHandler {
- public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile(
- "[^]\\[a-z A-Z:0-9/'.()+\\d-§?]"
- );
- private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(
- new PlayerComparator()
- );
+ public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile("[^]\\[a-z A-Z:0-9/'.()+\\d-§?]");
+ private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(new PlayerComparator());
private static int ticksExisted = 0;
@SubscribeEvent
@@ -36,65 +32,31 @@ public class ComponentHandler {
ticksExisted++;
boolean eventPass = false;
if (mc.theWorld != null) {
- List<NetworkPlayerInfo> players = sortingList.sortedCopy(
- mc.thePlayer.sendQueue.getPlayerInfoMap()
- );
+ List<NetworkPlayerInfo> players = sortingList.sortedCopy(mc.thePlayer.sendQueue.getPlayerInfoMap());
GuiIngameForge.renderObjective =
- !SkyblockHud.hasSkyblockScoreboard() ||
- !SkyblockHud.config.misc.hideScoreboard;
+ !SkyblockHud.hasSkyblockScoreboard() || !SkyblockHud.config.misc.hideScoreboard;
if (players != null && SkyblockHud.hasSkyblockScoreboard()) {
if (ticksExisted % 60 == 0) {
for (NetworkPlayerInfo player : players) {
if (player.getDisplayName() != null) {
String formattedTabListPlayer = SCOREBOARD_CHARACTERS
- .matcher(
- Utils.removeColor(
- player
- .getDisplayName()
- .getFormattedText()
- )
- )
+ .matcher(Utils.removeColor(player.getDisplayName().getFormattedText()))
.replaceAll("");
- if (
- LocationHandler
- .getCurrentLocation()
- .equals(Locations.CATACOMBS)
- ) {
+ if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) {
if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("secrets found:")
- ) DungeonHandler.parseTotalSecrets(
- formattedTabListPlayer
- );
+ formattedTabListPlayer.toLowerCase().contains("secrets found:")
+ ) DungeonHandler.parseTotalSecrets(formattedTabListPlayer);
if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("deaths:")
- ) DungeonHandler.parseDeaths(
- formattedTabListPlayer
- );
+ formattedTabListPlayer.toLowerCase().contains("deaths:")
+ ) DungeonHandler.parseDeaths(formattedTabListPlayer);
if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("crypts:")
- ) DungeonHandler.parseCrypts(
- formattedTabListPlayer
- );
+ formattedTabListPlayer.toLowerCase().contains("crypts:")
+ ) DungeonHandler.parseCrypts(formattedTabListPlayer);
} else if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.DWARVENMINES)
+ LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.DWARVENMINES)
) {
- if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("mithril powder:")
- ) {
- DwarvenMineHandler.parseMithril(
- formattedTabListPlayer
- );
+ if (formattedTabListPlayer.toLowerCase().contains("mithril powder:")) {
+ DwarvenMineHandler.parseMithril(formattedTabListPlayer);
}
} else if (
LocationHandler
@@ -102,18 +64,11 @@ public class ComponentHandler {
.getCategory()
.equals(LocationCategory.MUSHROOMDESERT)
) {
- if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("pelts:")
- ) {
+ if (formattedTabListPlayer.toLowerCase().contains("pelts:")) {
try {
FarmingIslandHandler.pelts =
Integer.parseInt(
- formattedTabListPlayer
- .toLowerCase()
- .replace("pelts:", "")
- .trim()
+ formattedTabListPlayer.toLowerCase().replace("pelts:", "").trim()
);
} catch (Exception ignored) {}
}
@@ -124,42 +79,20 @@ public class ComponentHandler {
for (int i = 61; i <= 80; i++) {
if (players.get(i).getDisplayName() != null) {
String formattedTabListPlayer = SCOREBOARD_CHARACTERS
- .matcher(
- Utils.removeColor(
- players
- .get(i)
- .getDisplayName()
- .getFormattedText()
- )
- )
+ .matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText()))
.replaceAll("");
- if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("event:")
- ) {
+ if (formattedTabListPlayer.toLowerCase().contains("event:")) {
if (i < 80) {
- if (
- players
- .get(i + 1)
- .getDisplayName() !=
- null
- ) {
+ if (players.get(i + 1).getDisplayName() != null) {
String secondLine = SCOREBOARD_CHARACTERS
.matcher(
Utils.removeColor(
- players
- .get(i + 1)
- .getDisplayName()
- .getFormattedText()
+ players.get(i + 1).getDisplayName().getFormattedText()
)
)
.replaceAll("");
SeasonDateHandler.setCurrentEvent(
- formattedTabListPlayer.replace(
- "Event:",
- ""
- ),
+ formattedTabListPlayer.replace("Event:", ""),
secondLine
);
eventPass = true;
@@ -173,39 +106,16 @@ public class ComponentHandler {
}
}
}
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.PARK)
- ) {
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
if (players.size() >= 80) {
for (int i = 41; i <= 60; i++) {
if (players.get(i).getDisplayName() != null) {
String formattedTabListPlayer = SCOREBOARD_CHARACTERS
- .matcher(
- Utils.removeColor(
- players
- .get(i)
- .getDisplayName()
- .getFormattedText()
- )
- )
+ .matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText()))
.replaceAll("");
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.PARK)
- ) {
- if (
- formattedTabListPlayer
- .toLowerCase()
- .contains("rain:")
- ) {
- ParkIslandHandler.parseRain(
- formattedTabListPlayer.toLowerCase()
- );
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
+ if (formattedTabListPlayer.toLowerCase().contains("rain:")) {
+ ParkIslandHandler.parseRain(formattedTabListPlayer.toLowerCase());
}
}
}
@@ -221,9 +131,9 @@ public class ComponentHandler {
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onStatusBar(ClientChatReceivedEvent event) {
if (event.type == 2) {
- if (
- LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)
- ) DungeonHandler.parseSecrets(event.message.getFormattedText());
+ if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) DungeonHandler.parseSecrets(
+ event.message.getFormattedText()
+ );
}
}
@@ -232,32 +142,20 @@ public class ComponentHandler {
private PlayerComparator() {}
- public int compare(
- NetworkPlayerInfo p_compare_1_,
- NetworkPlayerInfo p_compare_2_
- ) {
+ public int compare(NetworkPlayerInfo p_compare_1_, NetworkPlayerInfo p_compare_2_) {
ScorePlayerTeam scoreplayerteam = p_compare_1_.getPlayerTeam();
ScorePlayerTeam scoreplayerteam1 = p_compare_2_.getPlayerTeam();
return ComparisonChain
.start()
.compareTrueFirst(
- p_compare_1_.getGameType() !=
- WorldSettings.GameType.SPECTATOR,
- p_compare_2_.getGameType() !=
- WorldSettings.GameType.SPECTATOR
- )
- .compare(
- scoreplayerteam != null
- ? scoreplayerteam.getRegisteredName()
- : "",
- scoreplayerteam1 != null
- ? scoreplayerteam1.getRegisteredName()
- : ""
+ p_compare_1_.getGameType() != WorldSettings.GameType.SPECTATOR,
+ p_compare_2_.getGameType() != WorldSettings.GameType.SPECTATOR
)
.compare(
- p_compare_1_.getGameProfile().getName(),
- p_compare_2_.getGameProfile().getName()
+ scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "",
+ scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : ""
)
+ .compare(p_compare_1_.getGameProfile().getName(), p_compare_2_.getGameProfile().getName())
.result();
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java b/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
index d7c2513..af6b49c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
@@ -6,39 +6,19 @@ public class GuiTextures {
private GuiTextures() {}
- public static final ResourceLocation DISCORD = new ResourceLocation(
- "skyblockhud:discord.png"
- );
- public static final ResourceLocation TWITTER = new ResourceLocation(
- "skyblockhud:twitter.png"
- );
+ public static final ResourceLocation DISCORD = new ResourceLocation("skyblockhud:discord.png");
+ public static final ResourceLocation TWITTER = new ResourceLocation("skyblockhud:twitter.png");
- public static final ResourceLocation button_tex = new ResourceLocation(
- "skyblockhud:button.png"
- );
+ public static final ResourceLocation button_tex = new ResourceLocation("skyblockhud:button.png");
- public static final ResourceLocation button_white = new ResourceLocation(
- "skyblockhud:button_white.png"
- );
+ public static final ResourceLocation button_white = new ResourceLocation("skyblockhud:button_white.png");
- public static final ResourceLocation BAR = new ResourceLocation(
- "skyblockhud:core/bar.png"
- );
- public static final ResourceLocation OFF = new ResourceLocation(
- "skyblockhud:core/toggle_off.png"
- );
- public static final ResourceLocation ONE = new ResourceLocation(
- "skyblockhud:core/toggle_1.png"
- );
- public static final ResourceLocation TWO = new ResourceLocation(
- "skyblockhud:core/toggle_2.png"
- );
- public static final ResourceLocation THREE = new ResourceLocation(
- "skyblockhud:core/toggle_3.png"
- );
- public static final ResourceLocation ON = new ResourceLocation(
- "skyblockhud:core/toggle_on.png"
- );
+ public static final ResourceLocation BAR = new ResourceLocation("skyblockhud:core/bar.png");
+ public static final ResourceLocation OFF = new ResourceLocation("skyblockhud:core/toggle_off.png");
+ public static final ResourceLocation ONE = new ResourceLocation("skyblockhud:core/toggle_1.png");
+ public static final ResourceLocation TWO = new ResourceLocation("skyblockhud:core/toggle_2.png");
+ public static final ResourceLocation THREE = new ResourceLocation("skyblockhud:core/toggle_3.png");
+ public static final ResourceLocation ON = new ResourceLocation("skyblockhud:core/toggle_on.png");
public static final ResourceLocation slider_off_cap = new ResourceLocation(
"skyblockhud:core/slider/slider_off_cap.png"
@@ -62,24 +42,9 @@ public class GuiTextures {
"skyblockhud:core/slider/slider_button.png"
);
- public static final ResourceLocation overlay = new ResourceLocation(
- "skyblockhud",
- "stats.png"
- );
- public static final ResourceLocation dungeon = new ResourceLocation(
- "skyblockhud",
- "dungeon.png"
- );
- public static final ResourceLocation playerStat = new ResourceLocation(
- "skyblockhud",
- "playerstats.png"
- );
- public static final ResourceLocation bars = new ResourceLocation(
- "skyblockhud",
- "bars.png"
- );
- public static final ResourceLocation mapOverlay = new ResourceLocation(
- "skyblockhud",
- "maps/map_overlay.png"
- );
+ public static final ResourceLocation overlay = new ResourceLocation("skyblockhud", "stats.png");
+ public static final ResourceLocation dungeon = new ResourceLocation("skyblockhud", "dungeon.png");
+ public static final ResourceLocation playerStat = new ResourceLocation("skyblockhud", "playerstats.png");
+ public static final ResourceLocation bars = new ResourceLocation("skyblockhud", "bars.png");
+ public static final ResourceLocation mapOverlay = new ResourceLocation("skyblockhud", "maps/map_overlay.png");
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index dae040c..8cd8baf 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -56,10 +56,7 @@ public class SkyblockHud {
"\u7A7A\u5C9B\u751F\u5B58"
);
- private final Gson gson = new GsonBuilder()
- .setPrettyPrinting()
- .excludeFieldsWithoutExposeAnnotation()
- .create();
+ private final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
private static File configDirectory;
@@ -89,16 +86,12 @@ public class SkyblockHud {
MinecraftForge.EVENT_BUS.register(new ActionBarParsing());
Commands.init();
- configFile =
- new File(event.getModConfigurationDirectory(), "sbh-config.json");
+ configFile = new File(event.getModConfigurationDirectory(), "sbh-config.json");
if (configFile.exists()) {
try (
BufferedReader reader = new BufferedReader(
- new InputStreamReader(
- new FileInputStream(configFile),
- StandardCharsets.UTF_8
- )
+ new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)
)
) {
config = gson.fromJson(reader, SBHConfig.class);
@@ -122,10 +115,7 @@ public class SkyblockHud {
try (
BufferedWriter writer = new BufferedWriter(
- new OutputStreamWriter(
- new FileOutputStream(configFile),
- StandardCharsets.UTF_8
- )
+ new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8)
)
) {
writer.write(gson.toJson(config));
@@ -165,13 +155,9 @@ public class SkyblockHud {
if (mc != null && mc.theWorld != null) {
Scoreboard scoreboard = mc.theWorld.getScoreboard();
- ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(
- 1
- );
+ ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1);
if (sidebarObjective != null) {
- String objectiveName = sidebarObjective
- .getDisplayName()
- .replaceAll("(?i)\\u00A7.", "");
+ String objectiveName = sidebarObjective.getDisplayName().replaceAll("(?i)\\u00A7.", "");
for (String skyblock : SKYBLOCK_IN_ALL_LANGUAGES) {
if (objectiveName.startsWith(skyblock)) {
return true;
@@ -185,18 +171,10 @@ public class SkyblockHud {
@SubscribeEvent
public void onTooltip(ItemTooltipEvent event) {
- if (
- event.itemStack != null &&
- Keyboard.isKeyDown(Keyboard.KEY_BACKSLASH)
- ) {
+ if (event.itemStack != null && Keyboard.isKeyDown(Keyboard.KEY_BACKSLASH)) {
try {
- StringSelection clipboard = new StringSelection(
- event.itemStack.serializeNBT().toString()
- );
- Toolkit
- .getDefaultToolkit()
- .getSystemClipboard()
- .setContents(clipboard, clipboard);
+ StringSelection clipboard = new StringSelection(event.itemStack.serializeNBT().toString());
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
} catch (Exception ignored) {}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java b/src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java
index f675778..38a48cc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java
@@ -5,24 +5,12 @@ import java.awt.*;
public class SpecialColour {
public static String special(int chromaSpeed, int alpha, int rgb) {
- return special(
- chromaSpeed,
- alpha,
- (rgb & 0xFF0000) >> 16,
- (rgb & 0x00FF00) >> 8,
- (rgb & 0x0000FF)
- );
+ return special(chromaSpeed, alpha, (rgb & 0xFF0000) >> 16, (rgb & 0x00FF00) >> 8, (rgb & 0x0000FF));
}
private static final int RADIX = 10;
- public static String special(
- int chromaSpeed,
- int alpha,
- int r,
- int g,
- int b
- ) {
+ public static String special(int chromaSpeed, int alpha, int r, int g, int b) {
StringBuilder sb = new StringBuilder();
sb.append(Integer.toString(chromaSpeed, RADIX)).append(":");
sb.append(Integer.toString(alpha, RADIX)).append(":");
@@ -51,9 +39,7 @@ public class SpecialColour {
int a = d[3];
int chr = d[4];
- return (
- (a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF)
- );
+ return ((a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF));
}
public static int getSpeed(String special) {
@@ -61,12 +47,7 @@ public class SpecialColour {
}
public static float getSecondsForSpeed(int speed) {
- return (
- (255 - speed) /
- 254f *
- (MAX_CHROMA_SECS - MIN_CHROMA_SECS) +
- MIN_CHROMA_SECS
- );
+ return ((255 - speed) / 254f * (MAX_CHROMA_SECS - MIN_CHROMA_SECS) + MIN_CHROMA_SECS);
}
private static final int MIN_CHROMA_SECS = 1;
@@ -88,16 +69,12 @@ public class SpecialColour {
if (chr > 0) {
float seconds = getSecondsForSpeed(chr);
- hsv[0] +=
- (System.currentTimeMillis() - startTime) / 1000f / seconds;
+ hsv[0] += (System.currentTimeMillis() - startTime) / 1000f / seconds;
hsv[0] %= 1;
if (hsv[0] < 0) hsv[0] += 1;
}
- return (
- (a & 0xFF) << 24 |
- (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF)
- );
+ return ((a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF));
}
public static int rotateHue(int argb, int degrees) {
@@ -111,9 +88,6 @@ public class SpecialColour {
hsv[0] += degrees / 360f;
hsv[0] %= 1;
- return (
- (a & 0xFF) << 24 |
- (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF)
- );
+ return ((a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF));
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
index 9f6712c..f03c6c0 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
@@ -23,25 +23,16 @@ import org.lwjgl.opengl.GL14;
public class Utils {
private static LinkedList<Integer> guiScales = new LinkedList<>();
- private static ScaledResolution lastScale = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ private static ScaledResolution lastScale = new ScaledResolution(Minecraft.getMinecraft());
//Labymod compatibility
- private static FloatBuffer projectionMatrixOld = BufferUtils.createFloatBuffer(
- 16
- );
- private static FloatBuffer modelviewMatrixOld = BufferUtils.createFloatBuffer(
- 16
- );
+ private static FloatBuffer projectionMatrixOld = BufferUtils.createFloatBuffer(16);
+ private static FloatBuffer modelviewMatrixOld = BufferUtils.createFloatBuffer(16);
public static String removeColor(String input) {
return input.replaceAll("(?i)\\u00A7.", "");
}
- public static String removeWhiteSpaceAndRemoveWord(
- String input,
- String replace
- ) {
+ public static String removeWhiteSpaceAndRemoveWord(String input, String replace) {
return input.toLowerCase().replace(" ", "").replace(replace, "");
}
@@ -55,9 +46,7 @@ public class Utils {
Item.getByNameOrId("minecraft:redstone_torch")
)
);
- if (player.getHeldItem() != null) return redstoneItems.contains(
- player.getHeldItem().getItem()
- );
+ if (player.getHeldItem() != null) return redstoneItems.contains(player.getHeldItem().getItem());
return false;
}
@@ -119,16 +108,8 @@ public class Utils {
}
}
- public static boolean overlayShouldRender(
- RenderGameOverlayEvent.ElementType type,
- boolean... booleans
- ) {
- return overlayShouldRender(
- false,
- type,
- RenderGameOverlayEvent.ElementType.HOTBAR,
- booleans
- );
+ public static boolean overlayShouldRender(RenderGameOverlayEvent.ElementType type, boolean... booleans) {
+ return overlayShouldRender(false, type, RenderGameOverlayEvent.ElementType.HOTBAR, booleans);
}
public static boolean overlayShouldRender(
@@ -148,22 +129,13 @@ public class Utils {
mc.gameSettings.showDebugInfo ||
(
mc.gameSettings.keyBindPlayerList.isKeyDown() &&
- (
- !mc.isIntegratedServerRunning() ||
- mc.thePlayer.sendQueue.getPlayerInfoMap().size() > 1
- )
+ (!mc.isIntegratedServerRunning() || mc.thePlayer.sendQueue.getPlayerInfoMap().size() > 1)
)
) {
return false;
}
}
- return (
- shouldRender &&
- (
- (type == null && Loader.isModLoaded("labymod")) ||
- type == checkType
- )
- );
+ return (shouldRender && ((type == null && Loader.isModLoaded("labymod")) || type == checkType));
}
public static void drawStringScaledMaxWidth(
@@ -209,15 +181,7 @@ public class Utils {
float factor = len / (float) strLen;
float fontHeight = 8 * factor;
- drawStringScaled(
- str,
- fr,
- x - len / 2f,
- y - fontHeight / 2f,
- shadow,
- colour,
- factor
- );
+ drawStringScaled(str, fr, x - len / 2f, y - fontHeight / 2f, shadow, colour, factor);
}
public static void drawTexturedRect(
@@ -240,59 +204,29 @@ public class Utils {
GL11.GL_ONE_MINUS_SRC_ALPHA
);
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MIN_FILTER,
- filter
- );
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MAG_FILTER,
- filter
- );
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, filter);
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, filter);
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
worldrenderer.pos(x, y + height, 0.0D).tex(uMin, vMax).endVertex();
- worldrenderer
- .pos(x + width, y + height, 0.0D)
- .tex(uMax, vMax)
- .endVertex();
+ worldrenderer.pos(x + width, y + height, 0.0D).tex(uMax, vMax).endVertex();
worldrenderer.pos(x + width, y, 0.0D).tex(uMax, vMin).endVertex();
worldrenderer.pos(x, y, 0.0D).tex(uMin, vMin).endVertex();
tessellator.draw();
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MIN_FILTER,
- GL11.GL_NEAREST
- );
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MAG_FILTER,
- GL11.GL_NEAREST
- );
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
GlStateManager.disableBlend();
}
- public static void drawTexturedRect(
- float x,
- float y,
- float width,
- float height
- ) {
+ public static void drawTexturedRect(float x, float y, float width, float height) {
drawTexturedRect(x, y, width, height, 0, 1, 0, 1);
}
- public static void drawTexturedRect(
- float x,
- float y,
- float width,
- float height,
- int filter
- ) {
+ public static void drawTexturedRect(float x, float y, float width, float height, int filter) {
drawTexturedRect(x, y, width, height, 0, 1, 0, 1, filter);
}
@@ -306,17 +240,7 @@ public class Utils {
float vMin,
float vMax
) {
- drawTexturedRect(
- x,
- y,
- width,
- height,
- uMin,
- uMax,
- vMin,
- vMax,
- GL11.GL_LINEAR
- );
+ drawTexturedRect(x, y, width, height, uMin, uMax, vMin, vMax, GL11.GL_LINEAR);
}
public static void resetGuiScale() {
@@ -350,14 +274,11 @@ public class Utils {
int newScale = guiScales.size() > 0
? Math.max(0, Math.min(4, guiScales.peek()))
: Minecraft.getMinecraft().gameSettings.guiScale;
- if (newScale == 0) newScale =
- Minecraft.getMinecraft().gameSettings.guiScale;
+ if (newScale == 0) newScale = Minecraft.getMinecraft().gameSettings.guiScale;
int oldScale = Minecraft.getMinecraft().gameSettings.guiScale;
Minecraft.getMinecraft().gameSettings.guiScale = newScale;
- ScaledResolution scaledresolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
Minecraft.getMinecraft().gameSettings.guiScale = oldScale;
if (guiScales.size() > 0) {
@@ -381,11 +302,7 @@ public class Utils {
GlStateManager.loadIdentity();
GlStateManager.translate(0.0F, 0.0F, -2000.0F);
} else {
- if (
- Loader.isModLoaded("labymod") &&
- projectionMatrixOld.limit() > 0 &&
- modelviewMatrixOld.limit() > 0
- ) {
+ if (Loader.isModLoaded("labymod") && projectionMatrixOld.limit() > 0 && modelviewMatrixOld.limit() > 0) {
GlStateManager.matrixMode(GL11.GL_PROJECTION);
GL11.glLoadMatrix(projectionMatrixOld);
GlStateManager.matrixMode(GL11.GL_MODELVIEW);
@@ -411,14 +328,7 @@ public class Utils {
return scaledresolution;
}
- public static void drawStringCentered(
- String str,
- FontRenderer fr,
- float x,
- float y,
- boolean shadow,
- int colour
- ) {
+ public static void drawStringCentered(String str, FontRenderer fr, float x, float y, boolean shadow, int colour) {
int strLen = fr.getStringWidth(str);
float x2 = x - strLen / 2f;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java b/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java
index b722df1..8d6002b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java
@@ -33,39 +33,25 @@ public class LeaderboardGetter {
Minecraft mc = Minecraft.getMinecraft();
if (mc.theWorld != null) {
Scoreboard scoreboard = mc.theWorld.getScoreboard();
- ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(
- 1
- );
+ ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1);
if (
sidebarObjective != null &&
- !MinecraftForge.EVENT_BUS.post(
- new SidebarPreGetEvent(scoreboard, sidebarObjective)
- )
+ !MinecraftForge.EVENT_BUS.post(new SidebarPreGetEvent(scoreboard, sidebarObjective))
) {
- Collection<Score> scoreList = sidebarObjective
- .getScoreboard()
- .getSortedScores(sidebarObjective);
+ Collection<Score> scoreList = sidebarObjective.getScoreboard().getSortedScores(sidebarObjective);
Map<Integer, String> scores = scoreList
.stream()
- .collect(
- Collectors.toMap(Score::getScorePoints, this::getLine)
- );
+ .collect(Collectors.toMap(Score::getScorePoints, this::getLine));
if (!cachedScores.equals(scores)) {
scores.forEach(
(score, name) -> {
- if (
- cachedScores.get(score) == null ||
- !cachedScores.get(score).equals(name)
- ) {
+ if (cachedScores.get(score) == null || !cachedScores.get(score).equals(name)) {
MinecraftForge.EVENT_BUS.post(
new SidebarLineUpdateEvent(
name,
- SCOREBOARD_CHARACTERS
- .matcher(name)
- .replaceAll("")
- .trim(),
+ SCOREBOARD_CHARACTERS.matcher(name).replaceAll("").trim(),
score,
scores.size(),
scoreboard,
@@ -80,35 +66,16 @@ public class LeaderboardGetter {
scores
.values()
.stream()
- .map(
- name ->
- SCOREBOARD_CHARACTERS
- .matcher(name)
- .replaceAll("")
- .trim()
- )
+ .map(name -> SCOREBOARD_CHARACTERS.matcher(name).replaceAll("").trim())
.collect(Collectors.toList());
}
- MinecraftForge.EVENT_BUS.post(
- new SidebarPostEvent(
- scoreboard,
- sidebarObjective,
- cachedScoresList
- )
- );
+ MinecraftForge.EVENT_BUS.post(new SidebarPostEvent(scoreboard, sidebarObjective, cachedScoresList));
}
}
}
public String getLine(Score score) {
- ScorePlayerTeam scorePlayerTeam = score
- .getScoreScoreboard()
- .getPlayersTeam(score.getPlayerName());
- return Utils.removeColor(
- ScorePlayerTeam.formatPlayerName(
- scorePlayerTeam,
- score.getPlayerName()
- )
- );
+ ScorePlayerTeam scorePlayerTeam = score.getScoreScoreboard().getPlayersTeam(score.getPlayerName());
+ return Utils.removeColor(ScorePlayerTeam.formatPlayerName(scorePlayerTeam, score.getPlayerName()));
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java
index 92ed25e..34d27e6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java
@@ -12,11 +12,7 @@ public class SidebarPostEvent extends Event {
public List<String> scores;
public String[] arrayScores;
- public SidebarPostEvent(
- Scoreboard scoreboard,
- ScoreObjective objective,
- List<String> scores
- ) {
+ public SidebarPostEvent(Scoreboard scoreboard, ScoreObjective objective, List<String> scores) {
this.scoreboard = scoreboard;
this.objective = objective;
this.scores = scores;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
index e09f324..8304906 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
@@ -16,45 +16,23 @@ public class Commands {
public void processCommand(ICommandSender sender, String[] args) {
if (args.length > 0) {
SkyblockHud.screenToOpen =
- new GuiScreenElementWrapper(
- new SBHConfigEditor(
- SkyblockHud.config,
- StringUtils.join(args, " ")
- )
- );
+ new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config, StringUtils.join(args, " ")));
} else {
- SkyblockHud.screenToOpen =
- new GuiScreenElementWrapper(
- new SBHConfigEditor(SkyblockHud.config)
- );
+ SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config));
}
}
};
- private static final SimpleCommand settingsCommand = new SimpleCommand(
- "sbh",
- settingsRunnable
- );
- private static final SimpleCommand settingsCommand2 = new SimpleCommand(
- "sbhsettings",
- settingsRunnable
- );
- private static final SimpleCommand settingsCommand3 = new SimpleCommand(
- "sbhud",
- settingsRunnable
- );
+ private static final SimpleCommand settingsCommand = new SimpleCommand("sbh", settingsRunnable);
+ private static final SimpleCommand settingsCommand2 = new SimpleCommand("sbhsettings", settingsRunnable);
+ private static final SimpleCommand settingsCommand3 = new SimpleCommand("sbhud", settingsRunnable);
private static final SimpleCommand mapCommand = new SimpleCommand(
"sbhmap",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .getMap() !=
- null
- ) SkyblockHud.screenToOpen = new MapHandler.MapScreen();
+ if (LocationHandler.getCurrentLocation().getCategory().getMap() != null) SkyblockHud.screenToOpen =
+ new MapHandler.MapScreen();
}
}
);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
index 358ebe0..db23b8e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
@@ -20,11 +20,7 @@ public class SimpleCommand extends CommandBase {
this.runnable = runnable;
}
- public SimpleCommand(
- String commandName,
- ProcessCommandRunnable runnable,
- TabCompleteRunnable tabRunnable
- ) {
+ public SimpleCommand(String commandName, ProcessCommandRunnable runnable, TabCompleteRunnable tabRunnable) {
this.commandName = commandName;
this.runnable = runnable;
this.tabRunnable = tabRunnable;
@@ -32,19 +28,12 @@ public class SimpleCommand extends CommandBase {
public abstract static class ProcessCommandRunnable {
- public abstract void processCommand(
- ICommandSender sender,
- String[] args
- );
+ public abstract void processCommand(ICommandSender sender, String[] args);
}
public abstract static class TabCompleteRunnable {
- public abstract List<String> tabComplete(
- ICommandSender sender,
- String[] args,
- BlockPos pos
- );
+ public abstract List<String> tabComplete(ICommandSender sender, String[] args, BlockPos pos);
}
public boolean canCommandSenderUseCommand(ICommandSender sender) {
@@ -59,21 +48,12 @@ public class SimpleCommand extends CommandBase {
return "/" + commandName;
}
- public void processCommand(ICommandSender sender, String[] args)
- throws CommandException {
+ public void processCommand(ICommandSender sender, String[] args) throws CommandException {
runnable.processCommand(sender, args);
}
- public List<String> addTabCompletionOptions(
- ICommandSender sender,
- String[] args,
- BlockPos pos
- ) {
- if (tabRunnable != null) return tabRunnable.tabComplete(
- sender,
- args,
- pos
- );
+ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+ if (tabRunnable != null) return tabRunnable.tabComplete(sender, args, pos);
return null;
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java b/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java
index 044bab9..9ffd352 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java
@@ -4,9 +4,5 @@ import net.minecraft.client.settings.KeyBinding;
public class KeyBindings {
- public static KeyBinding map = new KeyBinding(
- "Opens the big map.",
- 50,
- "SkyblockHud"
- );
+ public static KeyBinding map = new KeyBinding("Opens the big map.", 50, "SkyblockHud");
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
index 52272b7..84e5483 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
@@ -11,12 +11,7 @@ import net.minecraft.client.Minecraft;
public class SBHConfig extends Config {
- private void editOverlay(
- String activeConfig,
- int width,
- int height,
- Position position
- ) {
+ private void editOverlay(String activeConfig, int width, int height, Position position) {
Minecraft
.getMinecraft()
.displayGuiScreen(
@@ -28,12 +23,7 @@ public class SBHConfig extends Config {
() -> {},
() ->
SkyblockHud.screenToOpen =
- new GuiScreenElementWrapper(
- new SBHConfigEditor(
- SkyblockHud.config,
- activeConfig
- )
- )
+ new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config, activeConfig))
)
);
}
@@ -41,17 +31,10 @@ public class SBHConfig extends Config {
@Override
public void executeRunnable(String runnableId) {
String activeConfigCategory = null;
- if (
- Minecraft.getMinecraft()
- .currentScreen instanceof GuiScreenElementWrapper
- ) {
- GuiScreenElementWrapper wrapper = (GuiScreenElementWrapper) Minecraft.getMinecraft()
- .currentScreen;
+ if (Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper) {
+ GuiScreenElementWrapper wrapper = (GuiScreenElementWrapper) Minecraft.getMinecraft().currentScreen;
if (wrapper.element instanceof SBHConfigEditor) {
- activeConfigCategory =
- (
- (SBHConfigEditor) wrapper.element
- ).getSelectedCategoryName();
+ activeConfigCategory = ((SBHConfigEditor) wrapper.element).getSelectedCategoryName();
}
}
@@ -60,36 +43,16 @@ public class SBHConfig extends Config {
editOverlay(activeConfigCategory, 120, 47, rpg.rpgHudPosition);
return;
case "d1":
- editOverlay(
- activeConfigCategory,
- 120,
- 32,
- dungeon.dungeonPlayer1
- );
+ editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer1);
return;
case "d2":
- editOverlay(
- activeConfigCategory,
- 120,
- 32,
- dungeon.dungeonPlayer2
- );
+ editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer2);
return;
case "d3":
- editOverlay(
- activeConfigCategory,
- 120,
- 32,
- dungeon.dungeonPlayer3
- );
+ editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer3);
return;
case "d4":
- editOverlay(
- activeConfigCategory,
- 120,
- 32,
- dungeon.dungeonPlayer4
- );
+ editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer4);
return;
case "main":
editOverlay(activeConfigCategory, 1000, 34, main.mainHudPos);
@@ -101,12 +64,7 @@ public class SBHConfig extends Config {
editOverlay(activeConfigCategory, 72, 72, map.miniMapPosition);
return;
case "tracker":
- editOverlay(
- activeConfigCategory,
- 120,
- 70,
- trackers.trackerPosition
- );
+ editOverlay(activeConfigCategory, 120, 70, trackers.trackerPosition);
return;
}
}
@@ -142,10 +100,7 @@ public class SBHConfig extends Config {
public static class Misc {
@Expose
- @ConfigOption(
- name = "Hide Scoreboard",
- desc = "Hides the scoreboard when in skyblock."
- )
+ @ConfigOption(name = "Hide Scoreboard", desc = "Hides the scoreboard when in skyblock.")
@ConfigEditorBoolean
public boolean hideScoreboard = false;
}
@@ -166,10 +121,7 @@ public class SBHConfig extends Config {
public boolean twelveHourClock = false;
@Expose
- @ConfigOption(
- name = "Shift hud with boss",
- desc = "Shifts the hud when bossbar is visible."
- )
+ @ConfigOption(name = "Shift hud with boss", desc = "Shifts the hud when bossbar is visible.")
@ConfigEditorBoolean
public boolean bossShiftHud = true;
@@ -185,18 +137,12 @@ public class SBHConfig extends Config {
public static class RPGHud {
@Expose
- @ConfigOption(
- name = "Show RPG Hud",
- desc = "Allows you to show or hide the RPG Hud."
- )
+ @ConfigOption(name = "Show RPG Hud", desc = "Allows you to show or hide the RPG Hud.")
@ConfigEditorBoolean
public boolean showRpgHud = true;
@Expose
- @ConfigOption(
- name = "RPG Hud Position",
- desc = "Allows you to change the position of the RPG Hud."
- )
+ @ConfigOption(name = "RPG Hud Position", desc = "Allows you to change the position of the RPG Hud.")
@ConfigEditorButton(runnableId = "rpg", buttonText = "Edit")
public Position rpgHudPosition = new Position(1, 1);
}
@@ -209,48 +155,32 @@ public class SBHConfig extends Config {
public boolean ultimateBar = false;
@Expose
- @ConfigOption(
- name = "Hide Ultimate Bar",
- desc = "Hides the custom ultimate bar."
- )
+ @ConfigOption(name = "Hide Ultimate Bar", desc = "Hides the custom ultimate bar.")
@ConfigEditorBoolean
@ConfigAccordionId(id = 2)
public boolean hideUltimateBar = false;
@Expose
- @ConfigOption(
- name = "Bar Position",
- desc = "Change the position of the bar."
- )
+ @ConfigOption(name = "Bar Position", desc = "Change the position of the bar.")
@ConfigEditorButton(runnableId = "ultimate", buttonText = "Edit")
@ConfigAccordionId(id = 2)
public Position barPosition = new Position(0, 50, true, false);
@Expose
- @ConfigOption(
- name = "Bar Loading Color",
- desc = "The color of the bar when its loading."
- )
+ @ConfigOption(name = "Bar Loading Color", desc = "The color of the bar when its loading.")
@ConfigEditorColour
@ConfigAccordionId(id = 2)
public String barLoadColor = "159:0:0:0:255";
@Expose
- @ConfigOption(
- name = "Bar Full Color",
- desc = "The color of the bar when its full."
- )
+ @ConfigOption(name = "Bar Full Color", desc = "The color of the bar when its full.")
@ConfigEditorColour
@ConfigAccordionId(id = 2)
public String barFullColor = "255:0:0:0:255";
@Expose
@ConfigOption(name = "Bar Style", desc = "Change the style of the bar")
- @ConfigEditorDropdown(
- values = {
- "No Notch", "6 Notch", "10 Notch", "12 Notch", "20 Notch"
- }
- )
+ @ConfigEditorDropdown(values = { "No Notch", "6 Notch", "10 Notch", "12 Notch", "20 Notch" })
@ConfigAccordionId(id = 2)
public int barStyle = 2;
@@ -260,10 +190,7 @@ public class SBHConfig extends Config {
public boolean dungeonPlayerAccordion = false;
@Expose
- @ConfigOption(
- name = "Hide Dungeon Players",
- desc = "Allows you to hide the dungeon player hud"
- )
+ @ConfigOption(name = "Hide Dungeon Players", desc = "Allows you to hide the dungeon player hud")
@ConfigEditorBoolean
@ConfigAccordionId(id = 1)
public boolean hideDungeonPlayers = false;
@@ -278,46 +205,31 @@ public class SBHConfig extends Config {
public int dungeonPlayerOpacity = 0;
@Expose
- @ConfigOption(
- name = "Hide Dead Players",
- desc = "Allows you to hide players that are dead or have left."
- )
+ @ConfigOption(name = "Hide Dead Players", desc = "Allows you to hide players that are dead or have left.")
@ConfigEditorBoolean
@ConfigAccordionId(id = 1)
public boolean hideDeadDungeonPlayers = false;
@Expose
- @ConfigOption(
- name = "Player Position 1",
- desc = "Change the position of this dungeon player."
- )
+ @ConfigOption(name = "Player Position 1", desc = "Change the position of this dungeon player.")
@ConfigEditorButton(runnableId = "d1", buttonText = "Edit")
@ConfigAccordionId(id = 1)
public Position dungeonPlayer1 = new Position(5, 5);
@Expose
- @ConfigOption(
- name = "Player Position 2",
- desc = "Change the position of this dungeon player."
- )
+ @ConfigOption(name = "Player Position 2", desc = "Change the position of this dungeon player.")
@ConfigEditorButton(runnableId = "d2", buttonText = "Edit")
@ConfigAccordionId(id = 1)
public Position dungeonPlayer2 = new Position(5, 42);
@Expose
- @ConfigOption(
- name = "Player Position 3",
- desc = "Change the position of this dungeon player."
- )
+ @ConfigOption(name = "Player Position 3", desc = "Change the position of this dungeon player.")
@ConfigEditorButton(runnableId = "d3", buttonText = "Edit")
@ConfigAccordionId(id = 1)
public Position dungeonPlayer3 = new Position(5, 79);
@Expose
- @ConfigOption(
- name = "Player Position 4",
- desc = "Change the position of this dungeon player."
- )
+ @ConfigOption(name = "Player Position 4", desc = "Change the position of this dungeon player.")
@ConfigEditorButton(runnableId = "d4", buttonText = "Edit")
@ConfigAccordionId(id = 1)
public Position dungeonPlayer4 = new Position(5, 116);
@@ -359,10 +271,7 @@ public class SBHConfig extends Config {
public boolean hideArmor = true;
@Expose
- @ConfigOption(
- name = "Hide Animal Hearts",
- desc = "Hides Animal Hearts."
- )
+ @ConfigOption(name = "Hide Animal Hearts", desc = "Hides Animal Hearts.")
@ConfigEditorBoolean
public boolean hideAnimalHearts = true;
}
@@ -386,10 +295,7 @@ public class SBHConfig extends Config {
public boolean showMiniMap = false;
@Expose
- @ConfigOption(
- name = "Mini-Map Position",
- desc = "Allows you to change the position of the Mini-Map."
- )
+ @ConfigOption(name = "Mini-Map Position", desc = "Allows you to change the position of the Mini-Map.")
@ConfigEditorButton(runnableId = "map", buttonText = "Edit")
public Position miniMapPosition = new Position(0, 100, false, false);
@@ -432,18 +338,12 @@ public class SBHConfig extends Config {
public static class Trackers {
@Expose
- @ConfigOption(
- name = "Tracker Position",
- desc = "Allows you to change the position of the Trackers."
- )
+ @ConfigOption(name = "Tracker Position", desc = "Allows you to change the position of the Trackers.")
@ConfigEditorButton(runnableId = "tracker", buttonText = "Edit")
public Position trackerPosition = new Position(-1, 200);
@Expose
- @ConfigOption(
- name = "Hide Tracker",
- desc = "It will still track the data just in case."
- )
+ @ConfigOption(name = "Hide Tracker", desc = "It will still track the data just in case.")
@ConfigEditorBoolean
public boolean hideTracker = false;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
index 0407607..3bac8ac 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
@@ -29,10 +29,7 @@ import org.lwjgl.opengl.GL11;
public class SBHConfigEditor extends GuiElement {
- private static final ResourceLocation[] socialsIco = new ResourceLocation[] {
- DISCORD,
- TWITTER
- };
+ private static final ResourceLocation[] socialsIco = new ResourceLocation[] { DISCORD, TWITTER };
private static final String[] socialsLink = new String[] {
"https://discord.gg/moulberry",
"https://twitter.com/thatgravytboat/"
@@ -71,12 +68,7 @@ public class SBHConfigEditor extends GuiElement {
}
if (selectedCategory == null) {
for (Map.Entry<String, ConfigProcessor.ProcessedCategory> category : processedConfig.entrySet()) {
- if (
- category
- .getValue()
- .name.toLowerCase()
- .startsWith(categoryOpen.toLowerCase())
- ) {
+ if (category.getValue().name.toLowerCase().startsWith(categoryOpen.toLowerCase())) {
selectedCategory = category.getKey();
break;
}
@@ -84,12 +76,7 @@ public class SBHConfigEditor extends GuiElement {
}
if (selectedCategory == null) {
for (Map.Entry<String, ConfigProcessor.ProcessedCategory> category : processedConfig.entrySet()) {
- if (
- category
- .getValue()
- .name.toLowerCase()
- .contains(categoryOpen.toLowerCase())
- ) {
+ if (category.getValue().name.toLowerCase().contains(categoryOpen.toLowerCase())) {
selectedCategory = category.getKey();
break;
}
@@ -130,19 +117,11 @@ public class SBHConfigEditor extends GuiElement {
long currentTime = System.currentTimeMillis();
long delta = currentTime - openedMillis;
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
int width = scaledResolution.getScaledWidth();
int height = scaledResolution.getScaledHeight();
- int mouseX =
- Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
- int mouseY =
- height -
- Mouse.getY() *
- height /
- Minecraft.getMinecraft().displayHeight -
- 1;
+ int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+ int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
float opacityFactor = LerpUtils.sigmoidZeroOne(delta / 500f);
RenderUtils.drawGradientRect(
@@ -155,18 +134,8 @@ public class SBHConfigEditor extends GuiElement {
(int) (0x90 * opacityFactor) << 24 | 0x101010
);
- int xSize = Math.min(
- scaledResolution.getScaledWidth() -
- 100 /
- scaledResolution.getScaleFactor(),
- 500
- );
- int ySize = Math.min(
- scaledResolution.getScaledHeight() -
- 100 /
- scaledResolution.getScaleFactor(),
- 400
- );
+ int xSize = Math.min(scaledResolution.getScaledWidth() - 100 / scaledResolution.getScaleFactor(), 500);
+ int ySize = Math.min(scaledResolution.getScaledHeight() - 100 / scaledResolution.getScaleFactor(), 400);
int x = (scaledResolution.getScaledWidth() - xSize) / 2;
int y = (scaledResolution.getScaledHeight() - ySize) / 2;
@@ -215,62 +184,20 @@ public class SBHConfigEditor extends GuiElement {
0xa0a0a0
);
- RenderUtils.drawFloatingRectDark(
- x + 4,
- y + 49 - 20,
- 140,
- ySize - 54 + 20,
- false
- );
+ RenderUtils.drawFloatingRectDark(x + 4, y + 49 - 20, 140, ySize - 54 + 20, false);
int innerPadding = 20 / adjScaleFactor;
int innerLeft = x + 4 + innerPadding;
int innerRight = x + 144 - innerPadding;
int innerTop = y + 49 + innerPadding;
int innerBottom = y + ySize - 5 - innerPadding;
- Gui.drawRect(
- innerLeft,
- innerTop,
- innerLeft + 1,
- innerBottom,
- 0xff08080E
- ); //Left
- Gui.drawRect(
- innerLeft + 1,
- innerTop,
- innerRight,
- innerTop + 1,
- 0xff08080E
- ); //Top
- Gui.drawRect(
- innerRight - 1,
- innerTop + 1,
- innerRight,
- innerBottom,
- 0xff28282E
- ); //Right
- Gui.drawRect(
- innerLeft + 1,
- innerBottom - 1,
- innerRight - 1,
- innerBottom,
- 0xff28282E
- ); //Bottom
- Gui.drawRect(
- innerLeft + 1,
- innerTop + 1,
- innerRight - 1,
- innerBottom - 1,
- 0x6008080E
- ); //Middle
+ Gui.drawRect(innerLeft, innerTop, innerLeft + 1, innerBottom, 0xff08080E); //Left
+ Gui.drawRect(innerLeft + 1, innerTop, innerRight, innerTop + 1, 0xff08080E); //Top
+ Gui.drawRect(innerRight - 1, innerTop + 1, innerRight, innerBottom, 0xff28282E); //Right
+ Gui.drawRect(innerLeft + 1, innerBottom - 1, innerRight - 1, innerBottom, 0xff28282E); //Bottom
+ Gui.drawRect(innerLeft + 1, innerTop + 1, innerRight - 1, innerBottom - 1, 0x6008080E); //Middle
- GlScissorStack.push(
- 0,
- innerTop + 1,
- scaledResolution.getScaledWidth(),
- innerBottom - 1,
- scaledResolution
- );
+ GlScissorStack.push(0, innerTop + 1, scaledResolution.getScaledWidth(), innerBottom - 1, scaledResolution);
float catBarSize = 1;
int catY = -categoryScroll.getValue();
@@ -278,79 +205,47 @@ public class SBHConfigEditor extends GuiElement {
LinkedHashMap<String, ConfigProcessor.ProcessedCategory> currentConfigEditing = getCurrentConfigEditing();
for (Map.Entry<String, ConfigProcessor.ProcessedCategory> entry : currentConfigEditing.entrySet()) {
String selectedCategory = getSelectedCategory();
- if (
- selectedCategory == null ||
- !currentConfigEditing.containsKey(selectedCategory)
- ) {
+ if (selectedCategory == null || !currentConfigEditing.containsKey(selectedCategory)) {
setSelectedCategory(entry.getKey());
}
String catName = entry.getValue().name;
if (entry.getKey().equals(getSelectedCategory())) {
- catName =
- EnumChatFormatting.DARK_AQUA.toString() +
- EnumChatFormatting.UNDERLINE +
- catName;
+ catName = EnumChatFormatting.DARK_AQUA.toString() + EnumChatFormatting.UNDERLINE + catName;
} else {
catName = EnumChatFormatting.GRAY + catName;
}
- TextRenderUtils.drawStringCenteredScaledMaxWidth(
- catName,
- fr,
- x + 75,
- y + 70 + catY,
- false,
- 100,
- -1
- );
+ TextRenderUtils.drawStringCenteredScaledMaxWidth(catName, fr, x + 75, y + 70 + catY, false, 100, -1);
catY += 15;
if (catY > 0) {
catBarSize =
LerpUtils.clampZeroOne(
- (float) (innerBottom - innerTop - 2) /
- (catY + 5 + categoryScroll.getValue())
+ (float) (innerBottom - innerTop - 2) / (catY + 5 + categoryScroll.getValue())
);
}
}
- float catBarStart =
- categoryScroll.getValue() /
- (float) (catY + categoryScroll.getValue());
+ float catBarStart = categoryScroll.getValue() / (float) (catY + categoryScroll.getValue());
float catBarEnd = catBarStart + catBarSize;
if (catBarEnd > 1) {
catBarEnd = 1;
- if (
- categoryScroll.getTarget() /
- (float) (catY + categoryScroll.getValue()) +
- catBarSize <
- 1
- ) {
+ if (categoryScroll.getTarget() / (float) (catY + categoryScroll.getValue()) + catBarSize < 1) {
int target = optionsScroll.getTarget();
categoryScroll.setValue(
(int) Math.ceil(
- (catY + 5 + categoryScroll.getValue()) -
- catBarSize *
- (catY + 5 + categoryScroll.getValue())
+ (catY + 5 + categoryScroll.getValue()) - catBarSize * (catY + 5 + categoryScroll.getValue())
)
);
categoryScroll.setTarget(target);
} else {
categoryScroll.setValue(
(int) Math.ceil(
- (catY + 5 + categoryScroll.getValue()) -
- catBarSize *
- (catY + 5 + categoryScroll.getValue())
+ (catY + 5 + categoryScroll.getValue()) - catBarSize * (catY + 5 + categoryScroll.getValue())
)
);
}
}
int catDist = innerBottom - innerTop - 12;
- Gui.drawRect(
- innerLeft + 2,
- innerTop + 5,
- innerLeft + 7,
- innerBottom - 5,
- 0xff101010
- );
+ Gui.drawRect(innerLeft + 2, innerTop + 5, innerLeft + 7, innerBottom - 5, 0xff101010);
Gui.drawRect(
innerLeft + 3,
innerTop + 6 + (int) (catDist * catBarStart),
@@ -361,23 +256,9 @@ public class SBHConfigEditor extends GuiElement {
GlScissorStack.pop(scaledResolution);
- TextRenderUtils.drawStringCenteredScaledMaxWidth(
- "Categories",
- fr,
- x + 75,
- y + 44,
- false,
- 120,
- 0xa368ef
- );
+ TextRenderUtils.drawStringCenteredScaledMaxWidth("Categories", fr, x + 75, y + 44, false, 120, 0xa368ef);
- RenderUtils.drawFloatingRectDark(
- x + 149,
- y + 29,
- xSize - 154,
- ySize - 34,
- false
- );
+ RenderUtils.drawFloatingRectDark(x + 149, y + 29, xSize - 154, ySize - 34, false);
innerLeft = x + 149 + innerPadding;
innerRight = x + xSize - 5 - innerPadding;
@@ -386,13 +267,8 @@ public class SBHConfigEditor extends GuiElement {
GlStateManager.color(1, 1, 1, 1);
int rightStuffLen = 20;
- if (
- getSelectedCategory() != null &&
- currentConfigEditing.containsKey(getSelectedCategory())
- ) {
- ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(
- getSelectedCategory()
- );
+ if (getSelectedCategory() != null && currentConfigEditing.containsKey(getSelectedCategory())) {
+ ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(getSelectedCategory());
TextRenderUtils.drawStringScaledMaxWidth(
cat.desc,
@@ -405,65 +281,21 @@ public class SBHConfigEditor extends GuiElement {
);
}
- Gui.drawRect(
- innerLeft,
- innerTop,
- innerLeft + 1,
- innerBottom,
- 0xff08080E
- ); //Left
- Gui.drawRect(
- innerLeft + 1,
- innerTop,
- innerRight,
- innerTop + 1,
- 0xff08080E
- ); //Top
- Gui.drawRect(
- innerRight - 1,
- innerTop + 1,
- innerRight,
- innerBottom,
- 0xff303036
- ); //Right
- Gui.drawRect(
- innerLeft + 1,
- innerBottom - 1,
- innerRight - 1,
- innerBottom,
- 0xff303036
- ); //Bottom
- Gui.drawRect(
- innerLeft + 1,
- innerTop + 1,
- innerRight - 1,
- innerBottom - 1,
- 0x6008080E
- ); //Middle
+ Gui.drawRect(innerLeft, innerTop, innerLeft + 1, innerBottom, 0xff08080E); //Left
+ Gui.drawRect(innerLeft + 1, innerTop, innerRight, innerTop + 1, 0xff08080E); //Top
+ Gui.drawRect(innerRight - 1, innerTop + 1, innerRight, innerBottom, 0xff303036); //Right
+ Gui.drawRect(innerLeft + 1, innerBottom - 1, innerRight - 1, innerBottom, 0xff303036); //Bottom
+ Gui.drawRect(innerLeft + 1, innerTop + 1, innerRight - 1, innerBottom - 1, 0x6008080E); //Middle
- GlScissorStack.push(
- innerLeft + 1,
- innerTop + 1,
- innerRight - 1,
- innerBottom - 1,
- scaledResolution
- );
+ GlScissorStack.push(innerLeft + 1, innerTop + 1, innerRight - 1, innerBottom - 1, scaledResolution);
float barSize = 1;
int optionY = -optionsScroll.getValue();
- if (
- getSelectedCategory() != null &&
- currentConfigEditing.containsKey(getSelectedCategory())
- ) {
- ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(
- getSelectedCategory()
- );
+ if (getSelectedCategory() != null && currentConfigEditing.containsKey(getSelectedCategory())) {
+ ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(getSelectedCategory());
int optionWidthDefault = innerRight - innerLeft - 20;
GlStateManager.enableDepth();
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
int optionWidth = optionWidthDefault;
if (option.accordionId >= 0) {
if (!activeAccordions.contains(option.accordionId)) {
@@ -483,15 +315,8 @@ public class SBHConfigEditor extends GuiElement {
}
}
int optionHeight = editor.getHeight();
- if (
- innerTop + 5 + optionY + optionHeight > innerTop + 1 &&
- innerTop + 5 + optionY < innerBottom - 1
- ) {
- editor.render(
- (innerLeft + innerRight - optionWidth) / 2 - 5,
- innerTop + 5 + optionY,
- optionWidth
- );
+ if (innerTop + 5 + optionY + optionHeight > innerTop + 1 && innerTop + 5 + optionY < innerBottom - 1) {
+ editor.render((innerLeft + innerRight - optionWidth) / 2 - 5, innerTop + 5 + optionY, optionWidth);
}
optionY += optionHeight + 5;
}
@@ -499,8 +324,7 @@ public class SBHConfigEditor extends GuiElement {
if (optionY > 0) {
barSize =
LerpUtils.clampZeroOne(
- (float) (innerBottom - innerTop - 2) /
- (optionY + 5 + optionsScroll.getValue())
+ (float) (innerBottom - innerTop - 2) / (optionY + 5 + optionsScroll.getValue())
);
}
}
@@ -508,23 +332,15 @@ public class SBHConfigEditor extends GuiElement {
GlScissorStack.pop(scaledResolution);
GL11.glDisable(GL11.GL_SCISSOR_TEST);
- if (
- getSelectedCategory() != null &&
- currentConfigEditing.containsKey(getSelectedCategory())
- ) {
+ if (getSelectedCategory() != null && currentConfigEditing.containsKey(getSelectedCategory())) {
int optionYOverlay = -optionsScroll.getValue();
- ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(
- getSelectedCategory()
- );
+ ConfigProcessor.ProcessedCategory cat = currentConfigEditing.get(getSelectedCategory());
int optionWidthDefault = innerRight - innerLeft - 20;
GlStateManager.translate(0, 0, 10);
GlStateManager.enableDepth();
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
int optionWidth = optionWidthDefault;
if (option.accordionId >= 0) {
if (!activeAccordions.contains(option.accordionId)) {
@@ -545,12 +361,7 @@ public class SBHConfigEditor extends GuiElement {
}
int optionHeight = editor.getHeight();
if (
- innerTop +
- 5 +
- optionYOverlay +
- optionHeight >
- innerTop +
- 1 &&
+ innerTop + 5 + optionYOverlay + optionHeight > innerTop + 1 &&
innerTop + 5 + optionYOverlay < innerBottom - 1
) {
editor.renderOverlay(
@@ -566,45 +377,28 @@ public class SBHConfigEditor extends GuiElement {
}
GL11.glEnable(GL11.GL_SCISSOR_TEST);
- float barStart =
- optionsScroll.getValue() /
- (float) (optionY + optionsScroll.getValue());
+ float barStart = optionsScroll.getValue() / (float) (optionY + optionsScroll.getValue());
float barEnd = barStart + barSize;
if (barEnd > 1) {
barEnd = 1;
- if (
- optionsScroll.getTarget() /
- (float) (optionY + optionsScroll.getValue()) +
- barSize <
- 1
- ) {
+ if (optionsScroll.getTarget() / (float) (optionY + optionsScroll.getValue()) + barSize < 1) {
int target = optionsScroll.getTarget();
optionsScroll.setValue(
(int) Math.ceil(
- (optionY + 5 + optionsScroll.getValue()) -
- barSize *
- (optionY + 5 + optionsScroll.getValue())
+ (optionY + 5 + optionsScroll.getValue()) - barSize * (optionY + 5 + optionsScroll.getValue())
)
);
optionsScroll.setTarget(target);
} else {
optionsScroll.setValue(
(int) Math.ceil(
- (optionY + 5 + optionsScroll.getValue()) -
- barSize *
- (optionY + 5 + optionsScroll.getValue())
+ (optionY + 5 + optionsScroll.getValue()) - barSize * (optionY + 5 + optionsScroll.getValue())
)
);
}
}
int dist = innerBottom - innerTop - 12;
- Gui.drawRect(
- innerRight - 10,
- innerTop + 5,
- innerRight - 5,
- innerBottom - 5,
- 0xff101010
- );
+ Gui.drawRect(innerRight - 10, innerTop + 5, innerRight - 5, innerBottom - 5, 0xff101010);
Gui.drawRect(
innerRight - 9,
innerTop + 6 + (int) (dist * barStart),
@@ -613,37 +407,16 @@ public class SBHConfigEditor extends GuiElement {
0xff303030
);
- for (
- int socialIndex = 0;
- socialIndex < socialsIco.length;
- socialIndex++
- ) {
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(socialsIco[socialIndex]);
+ for (int socialIndex = 0; socialIndex < socialsIco.length; socialIndex++) {
+ Minecraft.getMinecraft().getTextureManager().bindTexture(socialsIco[socialIndex]);
GlStateManager.color(1, 1, 1, 1);
int socialLeft = x + xSize - 23 - 18 * socialIndex;
- RenderUtils.drawTexturedRect(
- socialLeft,
- y + 7,
- 16,
- 16,
- GL11.GL_LINEAR
- );
+ RenderUtils.drawTexturedRect(socialLeft, y + 7, 16, 16, GL11.GL_LINEAR);
- if (
- mouseX >= socialLeft &&
- mouseX <= socialLeft + 16 &&
- mouseY >= y + 6 &&
- mouseY <= y + 23
- ) {
+ if (mouseX >= socialLeft && mouseX <= socialLeft + 16 && mouseY >= y + 6 && mouseY <= y + 23) {
tooltipToDisplay =
Lists.newArrayList(
- EnumChatFormatting.YELLOW +
- "Go to: " +
- EnumChatFormatting.RESET +
- socialsLink[socialIndex]
+ EnumChatFormatting.YELLOW + "Go to: " + EnumChatFormatting.RESET + socialsLink[socialIndex]
);
}
}
@@ -651,35 +424,19 @@ public class SBHConfigEditor extends GuiElement {
GlScissorStack.clear();
if (tooltipToDisplay != null) {
- TextRenderUtils.drawHoveringText(
- tooltipToDisplay,
- mouseX,
- mouseY,
- width,
- height,
- -1,
- fr
- );
+ TextRenderUtils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
}
GlStateManager.translate(0, 0, -2);
}
public boolean mouseInput(int mouseX, int mouseY) {
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
int width = scaledResolution.getScaledWidth();
int height = scaledResolution.getScaledHeight();
- int xSize = Math.min(
- width - 100 / scaledResolution.getScaleFactor(),
- 500
- );
- int ySize = Math.min(
- height - 100 / scaledResolution.getScaleFactor(),
- 400
- );
+ int xSize = Math.min(width - 100 / scaledResolution.getScaleFactor(), 500);
+ int ySize = Math.min(height - 100 / scaledResolution.getScaleFactor(), 400);
int x = (scaledResolution.getScaledWidth() - xSize) / 2;
int y = (scaledResolution.getScaledHeight() - ySize) / 2;
@@ -717,16 +474,11 @@ public class SBHConfigEditor extends GuiElement {
catY += 15;
if (catY > 0) {
catBarSize =
- LerpUtils.clampZeroOne(
- (float) (innerBottom - innerTop - 2) /
- (catY + 5 + newTarget)
- );
+ LerpUtils.clampZeroOne((float) (innerBottom - innerTop - 2) / (catY + 5 + newTarget));
}
}
- int barMax = (int) Math.floor(
- (catY + 5 + newTarget) - catBarSize * (catY + 5 + newTarget)
- );
+ int barMax = (int) Math.floor((catY + 5 + newTarget) - catBarSize * (catY + 5 + newTarget));
if (newTarget > barMax) {
newTarget = barMax;
}
@@ -745,17 +497,11 @@ public class SBHConfigEditor extends GuiElement {
getCurrentConfigEditing() != null &&
getCurrentConfigEditing().containsKey(getSelectedCategory())
) {
- ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing()
- .get(getSelectedCategory());
+ ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing().get(getSelectedCategory());
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
if (option.accordionId >= 0) {
- if (
- !activeAccordions.contains(option.accordionId)
- ) {
+ if (!activeAccordions.contains(option.accordionId)) {
continue;
}
}
@@ -767,9 +513,7 @@ public class SBHConfigEditor extends GuiElement {
if (editor instanceof GuiOptionEditorAccordion) {
GuiOptionEditorAccordion accordion = (GuiOptionEditorAccordion) editor;
if (accordion.getToggled()) {
- activeAccordions.add(
- accordion.getAccordionId()
- );
+ activeAccordions.add(accordion.getAccordionId());
}
}
optionY += editor.getHeight() + 5;
@@ -777,29 +521,18 @@ public class SBHConfigEditor extends GuiElement {
if (optionY > 0) {
barSize =
LerpUtils.clampZeroOne(
- (float) (innerBottom - innerTop - 2) /
- (optionY + 5 + newTarget)
+ (float) (innerBottom - innerTop - 2) / (optionY + 5 + newTarget)
);
}
}
}
- int barMax = (int) Math.floor(
- (optionY + 5 + newTarget) -
- barSize *
- (optionY + 5 + newTarget)
- );
+ int barMax = (int) Math.floor((optionY + 5 + newTarget) - barSize * (optionY + 5 + newTarget));
if (newTarget > barMax) {
newTarget = barMax;
}
optionsScroll.setTimeToReachTarget(
- Math.min(
- 150,
- Math.max(
- 10,
- 5 * Math.abs(newTarget - optionsScroll.getValue())
- )
- )
+ Math.min(150, Math.max(10, 5 * Math.abs(newTarget - optionsScroll.getValue())))
);
optionsScroll.resetTimer();
optionsScroll.setTarget(newTarget);
@@ -825,23 +558,12 @@ public class SBHConfigEditor extends GuiElement {
}
}
- for (
- int socialIndex = 0;
- socialIndex < socialsLink.length;
- socialIndex++
- ) {
+ for (int socialIndex = 0; socialIndex < socialsLink.length; socialIndex++) {
int socialLeft = x + xSize - 23 - 18 * socialIndex;
- if (
- mouseX >= socialLeft &&
- mouseX <= socialLeft + 16 &&
- mouseY >= y + 6 &&
- mouseY <= y + 23
- ) {
+ if (mouseX >= socialLeft && mouseX <= socialLeft + 16 && mouseY >= y + 6 && mouseY <= y + 23) {
try {
- Desktop
- .getDesktop()
- .browse(new URI(socialsLink[socialIndex]));
+ Desktop.getDesktop().browse(new URI(socialsLink[socialIndex]));
} catch (Exception ignored) {}
return true;
}
@@ -855,13 +577,9 @@ public class SBHConfigEditor extends GuiElement {
getCurrentConfigEditing().containsKey(getSelectedCategory())
) {
int optionWidthDefault = innerRight - innerLeft - 20;
- ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing()
- .get(getSelectedCategory());
+ ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing().get(getSelectedCategory());
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
int optionWidth = optionWidthDefault;
if (option.accordionId >= 0) {
if (!activeAccordions.contains(option.accordionId)) {
@@ -895,12 +613,7 @@ public class SBHConfigEditor extends GuiElement {
}
}
- if (
- mouseX > innerLeft &&
- mouseX < innerRight &&
- mouseY > innerTop &&
- mouseY < innerBottom
- ) {
+ if (mouseX > innerLeft && mouseX < innerRight && mouseY > innerTop && mouseY < innerBottom) {
optionY = -optionsScroll.getValue();
if (
getSelectedCategory() != null &&
@@ -908,13 +621,9 @@ public class SBHConfigEditor extends GuiElement {
getCurrentConfigEditing().containsKey(getSelectedCategory())
) {
int optionWidthDefault = innerRight - innerLeft - 20;
- ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing()
- .get(getSelectedCategory());
+ ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing().get(getSelectedCategory());
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
int optionWidth = optionWidthDefault;
if (option.accordionId >= 0) {
if (!activeAccordions.contains(option.accordionId)) {
@@ -953,15 +662,10 @@ public class SBHConfigEditor extends GuiElement {
}
public boolean keyboardInput() {
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
int width = scaledResolution.getScaledWidth();
- int xSize = Math.min(
- width - 100 / scaledResolution.getScaleFactor(),
- 500
- );
+ int xSize = Math.min(width - 100 / scaledResolution.getScaleFactor(), 500);
int adjScaleFactor = Math.max(2, scaledResolution.getScaleFactor());
@@ -973,13 +677,9 @@ public class SBHConfigEditor extends GuiElement {
getCurrentConfigEditing() != null &&
getCurrentConfigEditing().containsKey(getSelectedCategory())
) {
- ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing()
- .get(getSelectedCategory());
+ ConfigProcessor.ProcessedCategory cat = getCurrentConfigEditing().get(getSelectedCategory());
Set<Integer> activeAccordions = new HashSet<>();
- for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(
- cat
- )
- .values()) {
+ for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
if (option.accordionId >= 0) {
if (!activeAccordions.contains(option.accordionId)) {
continue;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java b/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
index e95e896..7c252ad 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
@@ -66,10 +66,8 @@ public class BackgroundBlur {
}
);
- output.framebufferWidth =
- output.framebufferTextureWidth = width;
- output.framebufferHeight =
- output.framebufferTextureHeight = height;
+ output.framebufferWidth = output.framebufferTextureWidth = width;
+ output.framebufferHeight = output.framebufferTextureHeight = height;
blurBackground(output, blur);
}
@@ -129,10 +127,7 @@ public class BackgroundBlur {
}
private static void blurBackground(Framebuffer output, float blurFactor) {
- if (
- !OpenGlHelper.isFramebufferEnabled() ||
- !OpenGlHelper.areShadersSupported()
- ) return;
+ if (!OpenGlHelper.isFramebufferEnabled() || !OpenGlHelper.areShadersSupported()) return;
int width = Minecraft.getMinecraft().displayWidth;
int height = Minecraft.getMinecraft().displayHeight;
@@ -151,14 +146,9 @@ public class BackgroundBlur {
if (blurOutputHorz == null || output == null) {
return;
}
- if (
- blurOutputHorz.framebufferWidth != width ||
- blurOutputHorz.framebufferHeight != height
- ) {
+ if (blurOutputHorz.framebufferWidth != width || blurOutputHorz.framebufferHeight != height) {
blurOutputHorz.createBindFramebuffer(width, height);
- blurShaderHorz.setProjectionMatrix(
- createProjectionMatrix(width, height)
- );
+ blurShaderHorz.setProjectionMatrix(createProjectionMatrix(width, height));
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
}
@@ -170,47 +160,22 @@ public class BackgroundBlur {
Minecraft.getMinecraft().getFramebuffer(),
blurOutputHorz
);
- blurShaderHorz
- .getShaderManager()
- .getShaderUniform("BlurDir")
- .set(1, 0);
- blurShaderHorz.setProjectionMatrix(
- createProjectionMatrix(width, height)
- );
+ blurShaderHorz.getShaderManager().getShaderUniform("BlurDir").set(1, 0);
+ blurShaderHorz.setProjectionMatrix(createProjectionMatrix(width, height));
} catch (Exception ignored) {}
try {
- blurShaderVert =
- new Shader(
- Minecraft.getMinecraft().getResourceManager(),
- "blur",
- blurOutputHorz,
- output
- );
- blurShaderVert
- .getShaderManager()
- .getShaderUniform("BlurDir")
- .set(0, 1);
- blurShaderVert.setProjectionMatrix(
- createProjectionMatrix(width, height)
- );
+ blurShaderVert = new Shader(Minecraft.getMinecraft().getResourceManager(), "blur", blurOutputHorz, output);
+ blurShaderVert.getShaderManager().getShaderUniform("BlurDir").set(0, 1);
+ blurShaderVert.setProjectionMatrix(createProjectionMatrix(width, height));
} catch (Exception ignored) {}
if (blurShaderHorz != null && blurShaderVert != null) {
- if (
- blurShaderHorz.getShaderManager().getShaderUniform("Radius") ==
- null
- ) {
+ if (blurShaderHorz.getShaderManager().getShaderUniform("Radius") == null) {
//Corrupted shader?
return;
}
- blurShaderHorz
- .getShaderManager()
- .getShaderUniform("Radius")
- .set(blurFactor);
- blurShaderVert
- .getShaderManager()
- .getShaderUniform("Radius")
- .set(blurFactor);
+ blurShaderHorz.getShaderManager().getShaderUniform("Radius").set(blurFactor);
+ blurShaderVert.getShaderManager().getShaderUniform("Radius").set(blurFactor);
GL11.glPushMatrix();
/*GL30.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, Minecraft.getMinecraft().getFramebuffer().framebufferObject);
@@ -237,16 +202,7 @@ public class BackgroundBlur {
int blurWidth,
int blurHeight
) {
- renderBlurredBackground(
- blurStrength,
- screenWidth,
- screenHeight,
- x,
- y,
- blurWidth,
- blurHeight,
- false
- );
+ renderBlurredBackground(blurStrength, screenWidth, screenHeight, x, y, blurWidth, blurHeight, false);
}
/**
@@ -263,10 +219,7 @@ public class BackgroundBlur {
int blurHeight,
boolean forcedUpdate
) {
- if (
- !OpenGlHelper.isFramebufferEnabled() ||
- !OpenGlHelper.areShadersSupported()
- ) return;
+ if (!OpenGlHelper.isFramebufferEnabled() || !OpenGlHelper.areShadersSupported()) return;
if (blurStrength < 0.5) return;
requestedBlurs.add(blurStrength);
@@ -292,16 +245,7 @@ public class BackgroundBlur {
Gui.drawRect(x, y, x + blurWidth, y + blurHeight, fogColour);
fb.bindFramebufferTexture();
GlStateManager.color(1f, 1f, 1f, 1f);
- RenderUtils.drawTexturedRect(
- x,
- y,
- blurWidth,
- blurHeight,
- uMin,
- uMax,
- vMin,
- vMax
- );
+ RenderUtils.drawTexturedRect(x, y, blurWidth, blurHeight, uMin, uMax, vMin, vMax);
fb.unbindFramebufferTexture();
GlStateManager.depthMask(true);
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java b/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
index b8e97ee..3137153 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
@@ -5,24 +5,12 @@ import java.awt.*;
public class ChromaColour {
public static String special(int chromaSpeed, int alpha, int rgb) {
- return special(
- chromaSpeed,
- alpha,
- (rgb & 0xFF0000) >> 16,
- (rgb & 0x00FF00) >> 8,
- (rgb & 0x0000FF)
- );
+ return special(chromaSpeed, alpha, (rgb & 0xFF0000) >> 16, (rgb & 0x00FF00) >> 8, (rgb & 0x0000FF));
}
private static final int RADIX = 10;
- public static String special(
- int chromaSpeed,
- int alpha,
- int r,
- int g,
- int b
- ) {
+ public static String special(int chromaSpeed, int alpha, int r, int g, int b) {
StringBuilder sb = new StringBuilder();
sb.append(Integer.toString(chromaSpeed, RADIX)).append(":");
sb.append(Integer.toString(alpha, RADIX)).append(":");
@@ -51,9 +39,7 @@ public class ChromaColour {
int a = d[3];
int chr = d[4];
- return (
- (a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF)
- );
+ return ((a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF));
}
public static int getSpeed(String special) {
@@ -61,12 +47,7 @@ public class ChromaColour {
}
public static float getSecondsForSpeed(int speed) {
- return (
- (255 - speed) /
- 254f *
- (MAX_CHROMA_SECS - MIN_CHROMA_SECS) +
- MIN_CHROMA_SECS
- );
+ return ((255 - speed) / 254f * (MAX_CHROMA_SECS - MIN_CHROMA_SECS) + MIN_CHROMA_SECS);
}
private static final int MIN_CHROMA_SECS = 1;
@@ -88,16 +69,12 @@ public class ChromaColour {
if (chr > 0) {
float seconds = getSecondsForSpeed(chr);
- hsv[0] +=
- (System.currentTimeMillis() - startTime) / 1000f / seconds;
+ hsv[0] += (System.currentTimeMillis() - startTime) / 1000f / seconds;
hsv[0] %= 1;
if (hsv[0] < 0) hsv[0] += 1;
}
- return (
- (a & 0xFF) << 24 |
- (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF)
- );
+ return ((a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF));
}
public static int rotateHue(int argb, int degrees) {
@@ -111,9 +88,6 @@ public class ChromaColour {
hsv[0] += degrees / 360f;
hsv[0] %= 1;
- return (
- (a & 0xFF) << 24 |
- (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF)
- );
+ return ((a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF));
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
index 306565e..0e1694e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
@@ -40,24 +40,13 @@ public class GlScissorStack {
public void set(ScaledResolution scaledResolution) {
int height = Minecraft.getMinecraft().displayHeight;
int scale = scaledResolution.getScaleFactor();
- GL11.glScissor(
- left * scale,
- height - bottom * scale,
- (right - left) * scale,
- (bottom - top) * scale
- );
+ GL11.glScissor(left * scale, height - bottom * scale, (right - left) * scale, (bottom - top) * scale);
}
}
private static final LinkedList<Bounds> boundsStack = new LinkedList<>();
- public static void push(
- int left,
- int top,
- int right,
- int bottom,
- ScaledResolution scaledResolution
- ) {
+ public static void push(int left, int top, int right, int bottom, ScaledResolution scaledResolution) {
if (right < left) {
int temp = right;
right = left;
@@ -71,9 +60,7 @@ public class GlScissorStack {
if (boundsStack.isEmpty()) {
boundsStack.push(new Bounds(left, top, right, bottom));
} else {
- boundsStack.push(
- boundsStack.peek().createSubBound(left, top, right, bottom)
- );
+ boundsStack.push(boundsStack.peek().createSubBound(left, top, right, bottom));
}
if (!boundsStack.isEmpty()) {
boundsStack.peek().set(scaledResolution);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java
index a8ed7d5..e41b7b3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java
@@ -24,22 +24,11 @@ public class GuiElementBoolean extends GuiElement {
private static final int xSize = 48;
private static final int ySize = 14;
- public GuiElementBoolean(
- int x,
- int y,
- boolean value,
- Consumer<Boolean> toggleCallback
- ) {
+ public GuiElementBoolean(int x, int y, boolean value, Consumer<Boolean> toggleCallback) {
this(x, y, value, 0, toggleCallback);
}
- public GuiElementBoolean(
- int x,
- int y,
- boolean value,
- int clickRadius,
- Consumer<Boolean> toggleCallback
- ) {
+ public GuiElementBoolean(int x, int y, boolean value, int clickRadius, Consumer<Boolean> toggleCallback) {
this.x = x;
this.y = y;
this.value = value;
@@ -54,10 +43,7 @@ public class GuiElementBoolean extends GuiElement {
@Override
public void render() {
GlStateManager.color(1, 1, 1, 1);
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(GuiTextures.BAR);
+ Minecraft.getMinecraft().getTextureManager().bindTexture(GuiTextures.BAR);
RenderUtils.drawTexturedRect(x, y, xSize, ySize);
ResourceLocation buttonLoc = GuiTextures.ON;
@@ -66,10 +52,7 @@ public class GuiElementBoolean extends GuiElement {
lastMillis = currentMillis;
boolean passedLimit = false;
if (previewValue != value) {
- if (
- (previewValue && animation > 12) ||
- (!previewValue && animation < 24)
- ) {
+ if ((previewValue && animation > 12) || (!previewValue && animation < 24)) {
passedLimit = true;
}
}
@@ -96,9 +79,7 @@ public class GuiElementBoolean extends GuiElement {
}
}
- int animation = (int) (
- LerpUtils.sigmoidZeroOne(this.animation / 36f) * 36
- );
+ int animation = (int) (LerpUtils.sigmoidZeroOne(this.animation / 36f) * 36);
if (animation < 3) {
buttonLoc = GuiTextures.OFF;
} else if (animation < 13) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java
index 8b5c2d6..a7db23b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java
@@ -31,9 +31,7 @@ public class GuiElementColour extends GuiElement {
"skyblockhud:core/colour_selector_chroma.png"
);
- private static final ResourceLocation colourPickerLocation = new ResourceLocation(
- "mbcore:dynamic/colourpicker"
- );
+ private static final ResourceLocation colourPickerLocation = new ResourceLocation("mbcore:dynamic/colourpicker");
private static final ResourceLocation colourPickerBarValueLocation = new ResourceLocation(
"mbcore:dynamic/colourpickervalue"
);
@@ -42,9 +40,7 @@ public class GuiElementColour extends GuiElement {
);
private final GuiElementTextField hexField = new GuiElementTextField(
"",
- GuiElementTextField.SCALE_TEXT |
- GuiElementTextField.FORCE_CAPS |
- GuiElementTextField.NO_SPACE
+ GuiElementTextField.SCALE_TEXT | GuiElementTextField.FORCE_CAPS | GuiElementTextField.NO_SPACE
);
private int x;
@@ -68,20 +64,10 @@ public class GuiElementColour extends GuiElement {
Consumer<String> colourChangedCallback,
Runnable closeCallback
) {
- final ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
- this.y =
- Math.max(
- 10,
- Math.min(scaledResolution.getScaledHeight() - ySize - 10, y)
- );
- this.x =
- Math.max(
- 10,
- Math.min(scaledResolution.getScaledWidth() - xSize - 10, x)
- );
+ this.y = Math.max(10, Math.min(scaledResolution.getScaledHeight() - ySize - 10, y));
+ this.x = Math.max(10, Math.min(scaledResolution.getScaledWidth() - xSize - 10, x));
this.colour = initialColour;
this.colourChangedCallback = colourChangedCallback;
@@ -89,12 +75,7 @@ public class GuiElementColour extends GuiElement {
int colour = ChromaColour.specialToSimpleRGB(initialColour);
Color c = new Color(colour);
- float[] hsv = Color.RGBtoHSB(
- c.getRed(),
- c.getGreen(),
- c.getBlue(),
- null
- );
+ float[] hsv = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), null);
updateAngleAndRadius(hsv);
}
@@ -108,51 +89,25 @@ public class GuiElementColour extends GuiElement {
int currentColour = ChromaColour.specialToSimpleRGB(colour);
Color c = new Color(currentColour, true);
- float[] hsv = Color.RGBtoHSB(
- c.getRed(),
- c.getGreen(),
- c.getBlue(),
- null
- );
+ float[] hsv = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), null);
- BufferedImage bufferedImage = new BufferedImage(
- 288,
- 288,
- BufferedImage.TYPE_INT_ARGB
- );
+ BufferedImage bufferedImage = new BufferedImage(288, 288, BufferedImage.TYPE_INT_ARGB);
float borderRadius = 0.05f;
if (Keyboard.isKeyDown(Keyboard.KEY_N)) borderRadius = 0;
for (int x = -16; x < 272; x++) {
for (int y = -16; y < 272; y++) {
- float radius = (float) Math.sqrt(
- ((x - 128) * (x - 128) + (y - 128) * (y - 128)) / 16384f
- );
- float angle = (float) Math.toDegrees(
- Math.atan((128 - x) / (y - 128 + 1E-5)) + Math.PI / 2
- );
+ float radius = (float) Math.sqrt(((x - 128) * (x - 128) + (y - 128) * (y - 128)) / 16384f);
+ float angle = (float) Math.toDegrees(Math.atan((128 - x) / (y - 128 + 1E-5)) + Math.PI / 2);
if (y < 128) angle += 180;
if (radius <= 1) {
- int rgb = Color
- .getHSBColor(
- angle / 360f,
- (float) Math.pow(radius, 1.5f),
- hsv[2]
- )
- .getRGB();
+ int rgb = Color.getHSBColor(angle / 360f, (float) Math.pow(radius, 1.5f), hsv[2]).getRGB();
bufferedImage.setRGB(x + 16, y + 16, rgb);
} else if (radius <= 1 + borderRadius) {
- float invBlackAlpha =
- Math.abs(radius - 1 - borderRadius / 2) /
- borderRadius *
- 2;
+ float invBlackAlpha = Math.abs(radius - 1 - borderRadius / 2) / borderRadius * 2;
float blackAlpha = 1 - invBlackAlpha;
if (radius > 1 + borderRadius / 2) {
- bufferedImage.setRGB(
- x + 16,
- y + 16,
- (int) (blackAlpha * 255) << 24
- );
+ bufferedImage.setRGB(x + 16, y + 16, (int) (blackAlpha * 255) << 24);
} else {
Color col = Color.getHSBColor(angle / 360f, 1, hsv[2]);
int rgb = (int) (col.getRed() * invBlackAlpha) << 16 |
@@ -164,34 +119,22 @@ public class GuiElementColour extends GuiElement {
}
}
- BufferedImage bufferedImageValue = new BufferedImage(
- 10,
- 64,
- BufferedImage.TYPE_INT_ARGB
- );
+ BufferedImage bufferedImageValue = new BufferedImage(10, 64, BufferedImage.TYPE_INT_ARGB);
for (int x = 0; x < 10; x++) {
for (int y = 0; y < 64; y++) {
if ((x == 0 || x == 9) && (y == 0 || y == 63)) continue;
- int rgb = Color
- .getHSBColor(wheelAngle / 360, wheelRadius, (64 - y) / 64f)
- .getRGB();
+ int rgb = Color.getHSBColor(wheelAngle / 360, wheelRadius, (64 - y) / 64f).getRGB();
bufferedImageValue.setRGB(x, y, rgb);
}
}
- BufferedImage bufferedImageOpacity = new BufferedImage(
- 10,
- 64,
- BufferedImage.TYPE_INT_ARGB
- );
+ BufferedImage bufferedImageOpacity = new BufferedImage(10, 64, BufferedImage.TYPE_INT_ARGB);
for (int x = 0; x < 10; x++) {
for (int y = 0; y < 64; y++) {
if ((x == 0 || x == 9) && (y == 0 || y == 63)) continue;
- int rgb =
- (currentColour & 0x00FFFFFF) |
- (Math.min(255, (64 - y) * 4) << 24);
+ int rgb = (currentColour & 0x00FFFFFF) | (Math.min(255, (64 - y) * 4) << 24);
bufferedImageOpacity.setRGB(x, y, rgb);
}
}
@@ -200,68 +143,30 @@ public class GuiElementColour extends GuiElement {
int selx = (int) (Math.cos(Math.toRadians(wheelAngle)) * selradius);
int sely = (int) (Math.sin(Math.toRadians(wheelAngle)) * selradius);
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colour_selector_bar_alpha);
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colour_selector_bar_alpha);
GlStateManager.color(1, 1, 1, 1);
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5 + 10 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5 + 10 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
Minecraft
.getMinecraft()
.getTextureManager()
- .loadTexture(
- colourPickerBarValueLocation,
- new DynamicTexture(bufferedImageValue)
- );
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colourPickerBarValueLocation);
+ .loadTexture(colourPickerBarValueLocation, new DynamicTexture(bufferedImageValue));
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colourPickerBarValueLocation);
GlStateManager.color(1, 1, 1, 1);
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
Minecraft
.getMinecraft()
.getTextureManager()
- .loadTexture(
- colourPickerBarOpacityLocation,
- new DynamicTexture(bufferedImageOpacity)
- );
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colourPickerBarOpacityLocation);
+ .loadTexture(colourPickerBarOpacityLocation, new DynamicTexture(bufferedImageOpacity));
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colourPickerBarOpacityLocation);
GlStateManager.color(1, 1, 1, 1);
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5 + 10 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5 + 10 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
int chromaSpeed = ChromaColour.getSpeed(colour);
int currentColourChroma = ChromaColour.specialToChromaRGB(colour);
Color cChroma = new Color(currentColourChroma, true);
- float hsvChroma[] = Color.RGBtoHSB(
- cChroma.getRed(),
- cChroma.getGreen(),
- cChroma.getBlue(),
- null
- );
+ float hsvChroma[] = Color.RGBtoHSB(cChroma.getRed(), cChroma.getGreen(), cChroma.getBlue(), null);
if (chromaSpeed > 0) {
Gui.drawRect(
@@ -278,58 +183,23 @@ public class GuiElementColour extends GuiElement {
x + 5 + 64 + 5 + 10 + 5 + 10 + 5 + 10 - 1,
y + 5 + 37 - 1,
Color.HSBtoRGB(
- (
- hsvChroma[0] +
- (System.currentTimeMillis() - ChromaColour.startTime) /
- 1000f
- ) %
- 1,
+ (hsvChroma[0] + (System.currentTimeMillis() - ChromaColour.startTime) / 1000f) % 1,
0.8f,
0.8f
)
);
}
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colour_selector_bar);
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colour_selector_bar);
GlStateManager.color(1, 1, 1, 1);
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5 + 10 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5 + 10 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
if (chromaSpeed > 0) {
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5 + 10 + 5 + 10 + 5,
- y + 5,
- 10,
- 64,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5 + 10 + 5 + 10 + 5, y + 5, 10, 64, GL11.GL_NEAREST);
} else {
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colour_selector_chroma);
- RenderUtils.drawTexturedRect(
- x + 5 + 64 + 5 + 10 + 5 + 10 + 5,
- y + 5 + 27,
- 10,
- 10,
- GL11.GL_NEAREST
- );
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colour_selector_chroma);
+ RenderUtils.drawTexturedRect(x + 5 + 64 + 5 + 10 + 5 + 10 + 5, y + 5 + 27, 10, 10, GL11.GL_NEAREST);
}
Gui.drawRect(
@@ -359,29 +229,14 @@ public class GuiElementColour extends GuiElement {
Minecraft
.getMinecraft()
.getTextureManager()
- .loadTexture(
- colourPickerLocation,
- new DynamicTexture(bufferedImage)
- );
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colourPickerLocation);
+ .loadTexture(colourPickerLocation, new DynamicTexture(bufferedImage));
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colourPickerLocation);
GlStateManager.color(1, 1, 1, 1);
RenderUtils.drawTexturedRect(x + 1, y + 1, 72, 72, GL11.GL_LINEAR);
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(colour_selector_dot);
+ Minecraft.getMinecraft().getTextureManager().bindTexture(colour_selector_dot);
GlStateManager.color(1, 1, 1, 1);
- RenderUtils.drawTexturedRect(
- x + 5 + 32 + selx - 4,
- y + 5 + 32 + sely - 4,
- 8,
- 8,
- GL11.GL_NEAREST
- );
+ RenderUtils.drawTexturedRect(x + 5 + 32 + selx - 4, y + 5 + 32 + sely - 4, 8, 8, GL11.GL_NEAREST);
TextRenderUtils.drawStringCenteredScaledMaxWidth(
EnumChatFormatting.GRAY.toString() + Math.round(hsv[2] * 100) + "",
@@ -393,9 +248,7 @@ public class GuiElementColour extends GuiElement {
-1
);
TextRenderUtils.drawStringCenteredScaledMaxWidth(
- EnumChatFormatting.GRAY.toString() +
- Math.round(c.getAlpha() / 255f * 100) +
- "",
+ EnumChatFormatting.GRAY.toString() + Math.round(c.getAlpha() / 255f * 100) + "",
Minecraft.getMinecraft().fontRendererObj,
x + 5 + 64 + 5 + 15 + 5,
y + 5 + 64 + 5 + 5,
@@ -405,9 +258,7 @@ public class GuiElementColour extends GuiElement {
);
if (chromaSpeed > 0) {
TextRenderUtils.drawStringCenteredScaledMaxWidth(
- EnumChatFormatting.GRAY.toString() +
- (int) ChromaColour.getSecondsForSpeed(chromaSpeed) +
- "s",
+ EnumChatFormatting.GRAY.toString() + (int) ChromaColour.getSecondsForSpeed(chromaSpeed) + "s",
Minecraft.getMinecraft().fontRendererObj,
x + 5 + 64 + 5 + 30 + 6,
y + 5 + 64 + 5 + 5,
@@ -418,9 +269,7 @@ public class GuiElementColour extends GuiElement {
}
hexField.setSize(48, 10);
- if (!hexField.getFocus()) hexField.setText(
- Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase()
- );
+ if (!hexField.getFocus()) hexField.setText(Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase());
StringBuilder sb = new StringBuilder(EnumChatFormatting.GRAY + "#");
for (int i = 0; i < 6 - hexField.getText().length(); i++) {
@@ -433,13 +282,9 @@ public class GuiElementColour extends GuiElement {
}
public boolean mouseInput(int mouseX, int mouseY) {
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
float mouseXF = (float) (
- Mouse.getX() *
- scaledResolution.getScaledWidth_double() /
- Minecraft.getMinecraft().displayWidth
+ Mouse.getX() * scaledResolution.getScaledWidth_double() / Minecraft.getMinecraft().displayWidth
);
float mouseYF = (float) (
scaledResolution.getScaledHeight_double() -
@@ -449,17 +294,10 @@ public class GuiElementColour extends GuiElement {
1
);
- if (
- (Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1) &&
- Mouse.getEventButtonState()
- ) {
+ if ((Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1) && Mouse.getEventButtonState()) {
if (mouseX > x + 5 + 8 && mouseX < x + 5 + 8 + 48) {
if (mouseY > y + 5 + 64 + 5 && mouseY < y + 5 + 64 + 5 + 10) {
- hexField.mouseClicked(
- mouseX,
- mouseY,
- Mouse.getEventButton()
- );
+ hexField.mouseClicked(mouseX, mouseY, Mouse.getEventButton());
clickedComponent = -1;
return true;
}
@@ -469,12 +307,7 @@ public class GuiElementColour extends GuiElement {
clickedComponent = -1;
}
if (Mouse.getEventButtonState() && Mouse.getEventButton() == 0) {
- if (
- mouseX >= x &&
- mouseX <= x + 119 &&
- mouseY >= y &&
- mouseY <= y + 89
- ) {
+ if (mouseX >= x && mouseX <= x + 119 && mouseY >= y && mouseY <= y + 89) {
hexField.unfocus();
int xWheel = mouseX - x - 5;
@@ -508,19 +341,10 @@ public class GuiElementColour extends GuiElement {
if (y > -5 && y <= 69) {
clickedComponent = 3;
}
- } else if (
- mouseY > this.y + 5 + 27 && mouseY < this.y + 5 + 37
- ) {
- int currentColour = ChromaColour.specialToSimpleRGB(
- colour
- );
+ } else if (mouseY > this.y + 5 + 27 && mouseY < this.y + 5 + 37) {
+ int currentColour = ChromaColour.specialToSimpleRGB(colour);
Color c = new Color(currentColour, true);
- colour =
- ChromaColour.special(
- 200,
- c.getAlpha(),
- currentColour
- );
+ colour = ChromaColour.special(200, c.getAlpha(), currentColour);
colourChangedCallback.accept(colour);
}
}
@@ -533,46 +357,24 @@ public class GuiElementColour extends GuiElement {
if (Mouse.isButtonDown(0) && clickedComponent >= 0) {
int currentColour = ChromaColour.specialToSimpleRGB(colour);
Color c = new Color(currentColour, true);
- float[] hsv = Color.RGBtoHSB(
- c.getRed(),
- c.getGreen(),
- c.getBlue(),
- null
- );
+ float[] hsv = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), null);
float xWheel = mouseXF - x - 5;
float yWheel = mouseYF - y - 5;
if (clickedComponent == 0) {
- float angle = (float) Math.toDegrees(
- Math.atan((32 - xWheel) / (yWheel - 32 + 1E-5)) +
- Math.PI /
- 2
- );
+ float angle = (float) Math.toDegrees(Math.atan((32 - xWheel) / (yWheel - 32 + 1E-5)) + Math.PI / 2);
xWheel = Math.max(0, Math.min(64, xWheel));
yWheel = Math.max(0, Math.min(64, yWheel));
float radius = (float) Math.sqrt(
- (
- (xWheel - 32) *
- (xWheel - 32) +
- (yWheel - 32) *
- (yWheel - 32)
- ) /
- 1024f
+ ((xWheel - 32) * (xWheel - 32) + (yWheel - 32) * (yWheel - 32)) / 1024f
);
if (yWheel < 32) angle += 180;
this.wheelAngle = angle;
this.wheelRadius = (float) Math.pow(Math.min(1, radius), 1.5f);
- int rgb = Color
- .getHSBColor(angle / 360f, wheelRadius, hsv[2])
- .getRGB();
- colour =
- ChromaColour.special(
- ChromaColour.getSpeed(colour),
- c.getAlpha(),
- rgb
- );
+ int rgb = Color.getHSBColor(angle / 360f, wheelRadius, hsv[2]).getRGB();
+ colour = ChromaColour.special(ChromaColour.getSpeed(colour), c.getAlpha(), rgb);
colourChangedCallback.accept(colour);
return true;
}
@@ -582,37 +384,21 @@ public class GuiElementColour extends GuiElement {
System.out.println(y);
if (clickedComponent == 1) {
- int rgb = Color
- .getHSBColor(wheelAngle / 360, wheelRadius, 1 - y / 64f)
- .getRGB();
- colour =
- ChromaColour.special(
- ChromaColour.getSpeed(colour),
- c.getAlpha(),
- rgb
- );
+ int rgb = Color.getHSBColor(wheelAngle / 360, wheelRadius, 1 - y / 64f).getRGB();
+ colour = ChromaColour.special(ChromaColour.getSpeed(colour), c.getAlpha(), rgb);
colourChangedCallback.accept(colour);
return true;
}
if (clickedComponent == 2) {
colour =
- ChromaColour.special(
- ChromaColour.getSpeed(colour),
- 255 - Math.round(y / 64f * 255),
- currentColour
- );
+ ChromaColour.special(ChromaColour.getSpeed(colour), 255 - Math.round(y / 64f * 255), currentColour);
colourChangedCallback.accept(colour);
return true;
}
if (clickedComponent == 3) {
- colour =
- ChromaColour.special(
- 255 - Math.round(y / 64f * 255),
- c.getAlpha(),
- currentColour
- );
+ colour = ChromaColour.special(255 - Math.round(y / 64f * 255), c.getAlpha(), currentColour);
colourChangedCallback.accept(colour);
}
return true;
@@ -628,10 +414,7 @@ public class GuiElementColour extends GuiElement {
}
String old = hexField.getText();
- hexField.keyTyped(
- Keyboard.getEventCharacter(),
- Keyboard.getEventKey()
- );
+ hexField.keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey());
if (hexField.getText().length() > 6) {
hexField.setText(old);
@@ -640,23 +423,12 @@ public class GuiElementColour extends GuiElement {
String text = hexField.getText().toLowerCase();
int rgb = Integer.parseInt(text, 16);
- int alpha =
- (ChromaColour.specialToSimpleRGB(colour) >> 24) & 0xFF;
- colour =
- ChromaColour.special(
- ChromaColour.getSpeed(colour),
- alpha,
- rgb
- );
+ int alpha = (ChromaColour.specialToSimpleRGB(colour) >> 24) & 0xFF;
+ colour = ChromaColour.special(ChromaColour.getSpeed(colour), alpha, rgb);
colourChangedCallback.accept(colour);
Color c = new Color(rgb);
- float[] hsv = Color.RGBtoHSB(
- c.getRed(),
- c.getGreen(),
- c.getBlue(),
- null
- );
+ float[] hsv = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), null);
updateAngleAndRadius(hsv);
} catch (Exception e) {}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java
index a3d01b5..cc002b2 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java
@@ -34,14 +34,7 @@ public class GuiElementTextField {
private String prependText = "";
- private final GuiTextField textField = new GuiTextField(
- 0,
- Minecraft.getMinecraft().fontRendererObj,
- 0,
- 0,
- 0,
- 0
- );
+ private final GuiTextField textField = new GuiTextField(0, Minecraft.getMinecraft().fontRendererObj, 0, 0, 0, 0);
private int customBorderColour = -1;
@@ -49,12 +42,7 @@ public class GuiElementTextField {
this(initialText, 100, 20, options);
}
- public GuiElementTextField(
- String initialText,
- int sizeX,
- int sizeY,
- int options
- ) {
+ public GuiElementTextField(String initialText, int sizeX, int sizeY, int options) {
textField.setFocused(true);
textField.setCanLoseFocus(false);
textField.setMaxStringLength(999);
@@ -109,18 +97,10 @@ public class GuiElementTextField {
}
public int getHeight() {
- ScaledResolution scaledresolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
- int paddingUnscaled =
- searchBarPadding / scaledresolution.getScaleFactor();
-
- int numLines =
- org.apache.commons.lang3.StringUtils.countMatches(
- textField.getText(),
- "\n"
- ) +
- 1;
+ ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
+ int paddingUnscaled = searchBarPadding / scaledresolution.getScaleFactor();
+
+ int numLines = org.apache.commons.lang3.StringUtils.countMatches(textField.getText(), "\n") + 1;
int extraSize = (searchBarYSize - 8) / 2 + 8;
int bottomTextBox = searchBarYSize + extraSize * (numLines - 1);
@@ -128,21 +108,14 @@ public class GuiElementTextField {
}
public int getWidth() {
- ScaledResolution scaledresolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
- int paddingUnscaled =
- searchBarPadding / scaledresolution.getScaleFactor();
+ ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
+ int paddingUnscaled = searchBarPadding / scaledresolution.getScaleFactor();
return searchBarXSize + paddingUnscaled * 2;
}
private float getScaleFactor(String str) {
- return Math.min(
- 1,
- (searchBarXSize - 2) /
- (float) Minecraft.getMinecraft().fontRendererObj.getStringWidth(str)
- );
+ return Math.min(1, (searchBarXSize - 2) / (float) Minecraft.getMinecraft().fontRendererObj.getStringWidth(str));
}
private boolean isScaling() {
@@ -151,10 +124,7 @@ public class GuiElementTextField {
private float getStringWidth(String str) {
if (isScaling()) {
- return (
- Minecraft.getMinecraft().fontRendererObj.getStringWidth(str) *
- getScaleFactor(str)
- );
+ return (Minecraft.getMinecraft().fontRendererObj.getStringWidth(str) * getScaleFactor(str));
} else {
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(str);
}
@@ -168,13 +138,9 @@ public class GuiElementTextField {
String renderText = prependText + textField.getText();
- int lineNum = Math.round(
- ((yComp - (searchBarYSize - 8) / 2)) / extraSize
- );
+ int lineNum = Math.round(((yComp - (searchBarYSize - 8) / 2)) / extraSize);
- Pattern patternControlCode = Pattern.compile(
- "(?i)\\u00A7([^\\u00B6])(?!\\u00B6)"
- );
+ Pattern patternControlCode = Pattern.compile("(?i)\\u00A7([^\\u00B6])(?!\\u00B6)");
String text = renderText;
String textNoColour = renderText;
if ((options & COLOUR) != 0) {
@@ -202,28 +168,15 @@ public class GuiElementTextField {
}
String textNC = textNoColour.substring(0, cursorIndex);
- int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(
- textNC,
- "\u00B6"
- );
- String line = text
- .substring(
- cursorIndex + (((options & COLOUR) != 0) ? colorCodes * 2 : 0)
- )
- .split("\n")[0];
+ int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(textNC, "\u00B6");
+ String line = text.substring(cursorIndex + (((options & COLOUR) != 0) ? colorCodes * 2 : 0)).split("\n")[0];
int padding = Math.min(5, searchBarXSize - strLenNoColor(line)) / 2;
- String trimmed = Minecraft
- .getMinecraft()
- .fontRendererObj.trimStringToWidth(line, xComp - padding);
+ String trimmed = Minecraft.getMinecraft().fontRendererObj.trimStringToWidth(line, xComp - padding);
int linePos = strLenNoColor(trimmed);
if (linePos != strLenNoColor(line)) {
char after = line.charAt(linePos);
- int trimmedWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(trimmed);
- int charWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getCharWidth(after);
+ int trimmedWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(trimmed);
+ int charWidth = Minecraft.getMinecraft().fontRendererObj.getCharWidth(after);
if (trimmedWidth + charWidth / 2 < xComp - padding) {
linePos++;
}
@@ -258,12 +211,7 @@ public class GuiElementTextField {
return str.replaceAll("(?i)\\u00A7.", "").length();
}
- public void mouseClickMove(
- int mouseX,
- int mouseY,
- int clickedMouseButton,
- long timeSinceLastClick
- ) {
+ public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
if (focus) {
textField.setSelectionPos(getCursorPos(mouseX, mouseY));
}
@@ -272,9 +220,7 @@ public class GuiElementTextField {
public void keyTyped(char typedChar, int keyCode) {
if (focus) {
if ((options & MULTILINE) != 0) { //Carriage return
- Pattern patternControlCode = Pattern.compile(
- "(?i)\\u00A7([^\\u00B6\n])(?!\\u00B6)"
- );
+ Pattern patternControlCode = Pattern.compile("(?i)\\u00A7([^\\u00B6\n])(?!\\u00B6)");
String text = textField.getText();
String textNoColour = textField.getText();
@@ -282,8 +228,7 @@ public class GuiElementTextField {
Matcher matcher = patternControlCode.matcher(text);
if (!matcher.find() || matcher.groupCount() < 1) break;
String code = matcher.group(1);
- text =
- matcher.replaceFirst("\u00A7" + code + "\u00B6" + code);
+ text = matcher.replaceFirst("\u00A7" + code + "\u00B6" + code);
}
while (true) {
Matcher matcher = patternControlCode.matcher(textNoColour);
@@ -293,29 +238,16 @@ public class GuiElementTextField {
}
if (keyCode == 28) {
- String before = textField
- .getText()
- .substring(0, textField.getCursorPosition());
- String after = textField
- .getText()
- .substring(textField.getCursorPosition());
+ String before = textField.getText().substring(0, textField.getCursorPosition());
+ String after = textField.getText().substring(textField.getCursorPosition());
int pos = textField.getCursorPosition();
textField.setText(before + "\n" + after);
textField.setCursorPosition(pos + 1);
return;
} else if (keyCode == 200) { //Up
- String textNCBeforeCursor = textNoColour.substring(
- 0,
- textField.getSelectionEnd()
- );
- int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(
- textNCBeforeCursor,
- "\u00B6"
- );
- String textBeforeCursor = text.substring(
- 0,
- textField.getSelectionEnd() + colorCodes * 2
- );
+ String textNCBeforeCursor = textNoColour.substring(0, textField.getSelectionEnd());
+ int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(textNCBeforeCursor, "\u00B6");
+ String textBeforeCursor = text.substring(0, textField.getSelectionEnd() + colorCodes * 2);
int numLinesBeforeCursor = org.apache.commons.lang3.StringUtils.countMatches(
textBeforeCursor,
@@ -326,9 +258,7 @@ public class GuiElementTextField {
int textBeforeCursorWidth;
String lineBefore;
String thisLineBeforeCursor;
- if (
- split.length == numLinesBeforeCursor && split.length > 0
- ) {
+ if (split.length == numLinesBeforeCursor && split.length > 0) {
textBeforeCursorWidth = 0;
lineBefore = split[split.length - 1];
thisLineBeforeCursor = "";
@@ -336,32 +266,19 @@ public class GuiElementTextField {
thisLineBeforeCursor = split[split.length - 1];
lineBefore = split[split.length - 2];
textBeforeCursorWidth =
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(
- thisLineBeforeCursor
- );
+ Minecraft.getMinecraft().fontRendererObj.getStringWidth(thisLineBeforeCursor);
} else {
return;
}
String trimmed = Minecraft
.getMinecraft()
- .fontRendererObj.trimStringToWidth(
- lineBefore,
- textBeforeCursorWidth
- );
+ .fontRendererObj.trimStringToWidth(lineBefore, textBeforeCursorWidth);
int linePos = strLenNoColor(trimmed);
if (linePos != strLenNoColor(lineBefore)) {
char after = lineBefore.charAt(linePos);
- int trimmedWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(trimmed);
- int charWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getCharWidth(after);
- if (
- trimmedWidth + charWidth / 2 < textBeforeCursorWidth
- ) {
+ int trimmedWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(trimmed);
+ int charWidth = Minecraft.getMinecraft().fontRendererObj.getCharWidth(after);
+ if (trimmedWidth + charWidth / 2 < textBeforeCursorWidth) {
linePos++;
}
}
@@ -378,18 +295,9 @@ public class GuiElementTextField {
textField.setCursorPosition(newPos);
}
} else if (keyCode == 208) { //Down
- String textNCBeforeCursor = textNoColour.substring(
- 0,
- textField.getSelectionEnd()
- );
- int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(
- textNCBeforeCursor,
- "\u00B6"
- );
- String textBeforeCursor = text.substring(
- 0,
- textField.getSelectionEnd() + colorCodes * 2
- );
+ String textNCBeforeCursor = textNoColour.substring(0, textField.getSelectionEnd());
+ int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(textNCBeforeCursor, "\u00B6");
+ String textBeforeCursor = text.substring(0, textField.getSelectionEnd() + colorCodes * 2);
int numLinesBeforeCursor = org.apache.commons.lang3.StringUtils.countMatches(
textBeforeCursor,
@@ -405,11 +313,7 @@ public class GuiElementTextField {
} else if (split.length > 0) {
thisLineBeforeCursor = split[split.length - 1];
textBeforeCursorWidth =
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(
- thisLineBeforeCursor
- );
+ Minecraft.getMinecraft().fontRendererObj.getStringWidth(thisLineBeforeCursor);
} else {
return;
}
@@ -419,25 +323,13 @@ public class GuiElementTextField {
String lineAfter = split2[numLinesBeforeCursor + 1];
String trimmed = Minecraft
.getMinecraft()
- .fontRendererObj.trimStringToWidth(
- lineAfter,
- textBeforeCursorWidth
- );
+ .fontRendererObj.trimStringToWidth(lineAfter, textBeforeCursorWidth);
int linePos = strLenNoColor(trimmed);
if (linePos != strLenNoColor(lineAfter)) {
char after = lineAfter.charAt(linePos);
- int trimmedWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(trimmed);
- int charWidth = Minecraft
- .getMinecraft()
- .fontRendererObj.getCharWidth(after);
- if (
- trimmedWidth +
- charWidth /
- 2 <
- textBeforeCursorWidth
- ) {
+ int trimmedWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(trimmed);
+ int charWidth = Minecraft.getMinecraft().fontRendererObj.getCharWidth(after);
+ if (trimmedWidth + charWidth / 2 < textBeforeCursorWidth) {
linePos++;
}
}
@@ -458,8 +350,7 @@ public class GuiElementTextField {
}
String old = textField.getText();
- if ((options & FORCE_CAPS) != 0) typedChar =
- Character.toUpperCase(typedChar);
+ if ((options & FORCE_CAPS) != 0) typedChar = Character.toUpperCase(typedChar);
if ((options & NO_SPACE) != 0 && typedChar == ' ') return;
textField.setFocused(true);
@@ -470,9 +361,7 @@ public class GuiElementTextField {
int pos = textField.getCursorPosition() - 2;
if (pos >= 0 && pos < textField.getText().length()) {
if (textField.getText().charAt(pos) == '&') {
- String before = textField
- .getText()
- .substring(0, pos);
+ String before = textField.getText().substring(0, pos);
String after = "";
if (pos + 2 < textField.getText().length()) {
after = textField.getText().substring(pos + 2);
@@ -484,25 +373,14 @@ public class GuiElementTextField {
}
}
- if (
- (options & NUM_ONLY) != 0 &&
- textField.getText().matches("[^0-9.]")
- ) textField.setText(old);
+ if ((options & NUM_ONLY) != 0 && textField.getText().matches("[^0-9.]")) textField.setText(old);
}
}
public void render(int x, int y) {
this.x = x;
this.y = y;
- drawTextbox(
- x,
- y,
- searchBarXSize,
- searchBarYSize,
- searchBarPadding,
- textField,
- focus
- );
+ drawTextbox(x, y, searchBarXSize, searchBarYSize, searchBarPadding, textField, focus);
}
private void drawTextbox(
@@ -514,9 +392,7 @@ public class GuiElementTextField {
GuiTextField textField,
boolean focus
) {
- ScaledResolution scaledresolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
String renderText = prependText + textField.getText();
GlStateManager.disableLighting();
@@ -524,16 +400,10 @@ public class GuiElementTextField {
/**
* Search bar
*/
- int paddingUnscaled =
- searchBarPadding / scaledresolution.getScaleFactor();
+ int paddingUnscaled = searchBarPadding / scaledresolution.getScaleFactor();
if (paddingUnscaled < 1) paddingUnscaled = 1;
- int numLines =
- org.apache.commons.lang3.StringUtils.countMatches(
- renderText,
- "\n"
- ) +
- 1;
+ int numLines = org.apache.commons.lang3.StringUtils.countMatches(renderText, "\n") + 1;
int extraSize = (searchBarYSize - 8) / 2 + 8;
int bottomTextBox = y + searchBarYSize + extraSize * (numLines - 1);
@@ -549,18 +419,10 @@ public class GuiElementTextField {
bottomTextBox + paddingUnscaled,
borderColour
);
- Gui.drawRect(
- x,
- y,
- x + searchBarXSize,
- bottomTextBox,
- Color.BLACK.getRGB()
- );
+ Gui.drawRect(x, y, x + searchBarXSize, bottomTextBox, Color.BLACK.getRGB());
//bar text
- Pattern patternControlCode = Pattern.compile(
- "(?i)\\u00A7([^\\u00B6\n])(?!\\u00B6)"
- );
+ Pattern patternControlCode = Pattern.compile("(?i)\\u00A7([^\\u00B6\n])(?!\\u00B6)");
String text = renderText;
String textNoColor = renderText;
@@ -587,23 +449,13 @@ public class GuiElementTextField {
if (
isScaling() &&
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(texts[yOffI]) >
- searchBarXSize -
- 10
+ Minecraft.getMinecraft().fontRendererObj.getStringWidth(texts[yOffI]) > searchBarXSize - 10
) {
scale =
(searchBarXSize - 2) /
- (float) Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(texts[yOffI]);
+ (float) Minecraft.getMinecraft().fontRendererObj.getStringWidth(texts[yOffI]);
if (scale > 1) scale = 1;
- float newLen =
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(texts[yOffI]) *
- scale;
+ float newLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(texts[yOffI]) * scale;
xStartOffset = (int) ((searchBarXSize - newLen) / 2f);
TextRenderUtils.drawStringCenteredScaledMaxWidth(
@@ -619,10 +471,7 @@ public class GuiElementTextField {
Minecraft
.getMinecraft()
.fontRendererObj.drawString(
- StringUtils.trimToWidth(
- texts[yOffI],
- searchBarXSize - 10
- ),
+ StringUtils.trimToWidth(texts[yOffI], searchBarXSize - 10),
x + 5,
y + (searchBarYSize - 8) / 2 + yOff,
Color.WHITE.getRGB()
@@ -631,25 +480,14 @@ public class GuiElementTextField {
}
if (focus && System.currentTimeMillis() % 1000 > 500) {
- String textNCBeforeCursor = textNoColor.substring(
- 0,
- textField.getCursorPosition() + prependText.length()
- );
- int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(
- textNCBeforeCursor,
- "\u00B6"
- );
+ String textNCBeforeCursor = textNoColor.substring(0, textField.getCursorPosition() + prependText.length());
+ int colorCodes = org.apache.commons.lang3.StringUtils.countMatches(textNCBeforeCursor, "\u00B6");
String textBeforeCursor = text.substring(
0,
- textField.getCursorPosition() +
- prependText.length() +
- (((options & COLOUR) != 0) ? colorCodes * 2 : 0)
+ textField.getCursorPosition() + prependText.length() + (((options & COLOUR) != 0) ? colorCodes * 2 : 0)
);
- int numLinesBeforeCursor = org.apache.commons.lang3.StringUtils.countMatches(
- textBeforeCursor,
- "\n"
- );
+ int numLinesBeforeCursor = org.apache.commons.lang3.StringUtils.countMatches(textBeforeCursor, "\n");
int yOff = numLinesBeforeCursor * extraSize;
String[] split = textBeforeCursor.split("\n");
@@ -658,14 +496,7 @@ public class GuiElementTextField {
textBeforeCursorWidth = 0;
} else {
textBeforeCursorWidth =
- (int) (
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(
- split[split.length - 1]
- ) *
- scale
- );
+ (int) (Minecraft.getMinecraft().fontRendererObj.getStringWidth(split[split.length - 1]) * scale);
}
Gui.drawRect(
x + xStartOffset + textBeforeCursorWidth,
@@ -701,16 +532,7 @@ public class GuiElementTextField {
char c = textNoColor.charAt(i);
if (sectionSignPrev) {
- if (
- c != 'k' &&
- c != 'K' &&
- c != 'm' &&
- c != 'M' &&
- c != 'n' &&
- c != 'N' &&
- c != 'o' &&
- c != 'O'
- ) {
+ if (c != 'k' && c != 'K' && c != 'm' && c != 'M' && c != 'n' && c != 'N' && c != 'o' && c != 'O') {
bold = c == 'l' || c == 'L';
}
sectionSignPrev = false;
@@ -739,12 +561,8 @@ public class GuiElementTextField {
//String c2 = bold ? EnumChatFormatting.BOLD.toString() : "" + c;
- System.out.println(
- "Adding len for char:" + c + ":" + Integer.toHexString(c)
- );
- int len = Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(String.valueOf(c));
+ System.out.println("Adding len for char:" + c + ":" + Integer.toHexString(c));
+ int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(String.valueOf(c));
if (bold) len++;
if (i >= leftIndex && i < rightIndex) {
Gui.drawRect(
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java
index 747d7c5..326c85f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java
@@ -22,12 +22,7 @@ public class GuiScreenElementWrapper extends GuiScreen {
public void handleMouseInput() throws IOException {
super.handleMouseInput();
int i = Mouse.getEventX() * this.width / this.mc.displayWidth;
- int j =
- this.height -
- Mouse.getEventY() *
- this.height /
- this.mc.displayHeight -
- 1;
+ int j = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
element.mouseInput(i, j);
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java
index 0151e76..0b3a1f5 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java
@@ -93,11 +93,7 @@ public class Position {
return ret;
}
- public int moveX(
- int deltaX,
- int objWidth,
- ScaledResolution scaledResolution
- ) {
+ public int moveX(int deltaX, int objWidth, ScaledResolution scaledResolution) {
int screenWidth = scaledResolution.getScaledWidth();
boolean wasPositiveX = this.x >= 0;
this.x += deltaX;
@@ -146,11 +142,7 @@ public class Position {
return deltaX;
}
- public int moveY(
- int deltaY,
- int objHeight,
- ScaledResolution scaledResolution
- ) {
+ public int moveY(int deltaY, int objHeight, ScaledResolution scaledResolution) {
int screenHeight = scaledResolution.getScaledHeight();
boolean wasPositiveY = this.y >= 0;
this.y += deltaY;
@@ -199,13 +191,7 @@ public class Position {
return deltaY;
}
- public boolean rightAligned(
- ScaledResolution scaledResolution,
- int objWidth
- ) {
- return (
- this.getAbsX(scaledResolution, objWidth) >
- (scaledResolution.getScaledWidth() / 2)
- );
+ public boolean rightAligned(ScaledResolution scaledResolution, int objWidth) {
+ return (this.getAbsX(scaledResolution, objWidth) > (scaledResolution.getScaledWidth() / 2));
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java
index 5dfcecc..85aa0b7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java
@@ -33,9 +33,7 @@ public abstract class GuiOptionEditor {
int maxLines = 5;
float scale = 1;
- int lineCount = fr
- .listFormattedStringToWidth(option.desc, width * 2 / 3 - 10)
- .size();
+ int lineCount = fr.listFormattedStringToWidth(option.desc, width * 2 / 3 - 10).size();
if (lineCount <= 0) return;
@@ -43,31 +41,15 @@ public abstract class GuiOptionEditor {
while (paraHeight >= HEIGHT - 10) {
scale -= 1 / 8f;
- lineCount =
- fr
- .listFormattedStringToWidth(
- option.desc,
- (int) (width * 2 / 3 / scale - 10)
- )
- .size();
+ lineCount = fr.listFormattedStringToWidth(option.desc, (int) (width * 2 / 3 / scale - 10)).size();
paraHeight = (int) (9 * scale * lineCount - 1 * scale);
}
GlStateManager.pushMatrix();
- GlStateManager.translate(
- x + 5 + width / 3f,
- y + HEIGHT / 2f - paraHeight / 2,
- 0
- );
+ GlStateManager.translate(x + 5 + width / 3f, y + HEIGHT / 2f - paraHeight / 2, 0);
GlStateManager.scale(scale, scale, 1);
- fr.drawSplitString(
- option.desc,
- 0,
- 0,
- (int) (width * 2 / 3 / scale - 10),
- 0xc0c0c0
- );
+ fr.drawSplitString(option.desc, 0, 0, (int) (width * 2 / 3 / scale - 10), 0xc0c0c0);
GlStateManager.popMatrix();
}
@@ -76,23 +58,11 @@ public abstract class GuiOptionEditor {
return HEIGHT;
}
- public abstract boolean mouseInput(
- int x,
- int y,
- int width,
- int mouseX,
- int mouseY
- );
+ public abstract boolean mouseInput(int x, int y, int width, int mouseX, int mouseY);
public abstract boolean keyboardInput();
- public boolean mouseInputOverlay(
- int x,
- int y,
- int width,
- int mouseX,
- int mouseY
- ) {
+ public boolean mouseInputOverlay(int x, int y, int width, int mouseX, int mouseY) {
return false;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java
index 5270c01..7888587 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java
@@ -16,10 +16,7 @@ public class GuiOptionEditorAccordion extends GuiOptionEditor {
private int accordionId;
private boolean accordionToggled;
- public GuiOptionEditorAccordion(
- ConfigProcessor.ProcessedOption option,
- int accordionId
- ) {
+ public GuiOptionEditorAccordion(ConfigProcessor.ProcessedOption option, int accordionId) {
super(option);
this.accordionToggled = (boolean) option.get();
this.accordionId = accordionId;
@@ -52,19 +49,11 @@ public class GuiOptionEditorAccordion extends GuiOptionEditor {
worldrenderer.begin(GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION);
if (accordionToggled) {
worldrenderer.pos((double) x + 6, (double) y + 6, 0.0D).endVertex();
- worldrenderer
- .pos((double) x + 9.75f, (double) y + 13.5f, 0.0D)
- .endVertex();
- worldrenderer
- .pos((double) x + 13.5f, (double) y + 6, 0.0D)
- .endVertex();
+ worldrenderer.pos((double) x + 9.75f, (double) y + 13.5f, 0.0D).endVertex();
+ worldrenderer.pos((double) x + 13.5f, (double) y + 6, 0.0D).endVertex();
} else {
- worldrenderer
- .pos((double) x + 6, (double) y + 13.5f, 0.0D)
- .endVertex();
- worldrenderer
- .pos((double) x + 13.5f, (double) y + 9.75f, 0.0D)
- .endVertex();
+ worldrenderer.pos((double) x + 6, (double) y + 13.5f, 0.0D).endVertex();
+ worldrenderer.pos((double) x + 13.5f, (double) y + 9.75f, 0.0D).endVertex();
worldrenderer.pos((double) x + 6, (double) y + 6, 0.0D).endVertex();
}
tessellator.draw();
@@ -84,13 +73,7 @@ public class GuiOptionEditorAccordion extends GuiOptionEditor {
@Override
public boolean mouseInput(int x, int y, int width, int mouseX, int mouseY) {
- if (
- Mouse.getEventButtonState() &&
- mouseX > x &&
- mouseX < x + width &&
- mouseY > y &&
- mouseY < y + getHeight()
- ) {
+ if (Mouse.getEventButtonState() && mouseX > x && mouseX < x + width && mouseY > y && mouseY < y + getHeight()) {
accordionToggled = !accordionToggled;
return true;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java
index 508a7cc..4167e06 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java
@@ -9,14 +9,7 @@ public class GuiOptionEditorBoolean extends GuiOptionEditor {
public GuiOptionEditorBoolean(ConfigProcessor.ProcessedOption option) {
super(option);
- bool =
- new GuiElementBoolean(
- 0,
- 0,
- (boolean) option.get(),
- 10,
- option::set
- );
+ bool = new GuiElementBoolean(0, 0, (boolean) option.get(), 10, option::set);
}
@Override
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java
index 01fb7bd..7868ece 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java
@@ -28,9 +28,7 @@ public class GuiOptionEditorButton extends GuiOptionEditor {
this.config = config;
this.buttonText = buttonText;
- if (
- this.buttonText != null && this.buttonText.isEmpty()
- ) this.buttonText = null;
+ if (this.buttonText != null && this.buttonText.isEmpty()) this.buttonText = null;
}
@Override
@@ -41,12 +39,7 @@ public class GuiOptionEditorButton extends GuiOptionEditor {
GlStateManager.color(1, 1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(button_tex);
- RenderUtils.drawTexturedRect(
- x + width / 6 - 24,
- y + height - 7 - 14,
- 48,
- 16
- );
+ RenderUtils.drawTexturedRect(x + width / 6 - 24, y + height - 7 - 14, 48, 16);
if (buttonText != null) {
TextRenderUtils.drawStringCenteredScaledMaxWidth(
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java
index ed44e5d..e64d14c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java
@@ -31,12 +31,7 @@ public class GuiOptionEditorColour extends GuiOptionEditor {
int b = argb & 0xFF;
GlStateManager.color(r / 255f, g / 255f, b / 255f, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(button_white);
- RenderUtils.drawTexturedRect(
- x + width / 6f - 24,
- y + height - 7 - 14,
- 48,
- 16
- );
+ RenderUtils.drawTexturedRect(x + width / 6f - 24, y + height - 7 - 14, 48, 16);
}
@Override
@@ -47,16 +42,8 @@ public class GuiOptionEditorColour extends GuiOptionEditor {
}
@Override
- public boolean mouseInputOverlay(
- int x,
- int y,
- int width,
- int mouseX,
- int mouseY
- ) {
- return (
- colourElement != null && colourElement.mouseInput(mouseX, mouseY)
- );
+ public boolean mouseInputOverlay(int x, int y, int width, int mouseX, int mouseY) {
+ return (colourElement != null && colourElement.mouseInput(mouseX, mouseY));
}
@Override
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java
index 619e144..11175a3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java
@@ -21,9 +21,7 @@ import org.lwjgl.opengl.GL11;
public class GuiOptionEditorDraggableList extends GuiOptionEditor {
- private static final ResourceLocation DELETE = new ResourceLocation(
- "notenoughupdates:core/delete.png"
- );
+ private static final ResourceLocation DELETE = new ResourceLocation("notenoughupdates:core/delete.png");
private String[] exampleText;
private List<Integer> activeText;
@@ -37,10 +35,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
private boolean dropdownOpen = false;
- public GuiOptionEditorDraggableList(
- ConfigProcessor.ProcessedOption option,
- String[] exampleText
- ) {
+ public GuiOptionEditorDraggableList(ConfigProcessor.ProcessedOption option, String[] exampleText) {
super(option);
this.exampleText = exampleText;
this.activeText = (List<Integer>) option.get();
@@ -66,12 +61,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
GlStateManager.color(1, 1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(button_tex);
- RenderUtils.drawTexturedRect(
- x + width / 6f - 24,
- y + 45 - 7 - 14,
- 48,
- 16
- );
+ RenderUtils.drawTexturedRect(x + width / 6f - 24, y + 45 - 7 - 14, 48, 16);
TextRenderUtils.drawStringCenteredScaledMaxWidth(
"Add",
@@ -85,18 +75,11 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
long currentTime = System.currentTimeMillis();
float greenBlue = LerpUtils.clampZeroOne(
- ((trashHoverTime < 0 ? 250 : 0) + trashHoverTime - currentTime) /
- 250f
+ ((trashHoverTime < 0 ? 250 : 0) + trashHoverTime - currentTime) / 250f
);
GlStateManager.color(1, greenBlue, greenBlue, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(DELETE);
- Utils.drawTexturedRect(
- x + width / 6f + 27,
- y + 45 - 7 - 13,
- 11,
- 14,
- GL11.GL_NEAREST
- );
+ Utils.drawTexturedRect(x + width / 6f + 27, y + 45 - 7 - 13, 11, 14, GL11.GL_NEAREST);
Gui.drawRect(x + 5, y + 45, x + width - 5, y + height - 5, 0xffdddddd);
Gui.drawRect(x + 6, y + 46, x + width - 6, y + height - 6, 0xff000000);
@@ -111,11 +94,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
int ySize = multilines.length * 10;
if (i++ != dragStartIndex) {
- for (
- int multilineIndex = 0;
- multilineIndex < multilines.length;
- multilineIndex++
- ) {
+ for (int multilineIndex = 0; multilineIndex < multilines.length; multilineIndex++) {
String line = multilines[multilineIndex];
Utils.drawStringScaledMaxWidth(
line + EnumChatFormatting.RESET,
@@ -129,13 +108,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
}
Minecraft
.getMinecraft()
- .fontRendererObj.drawString(
- "\u2261",
- x + 10,
- y + 50 + yOff + ySize / 2f - 4,
- 0xffffff,
- true
- );
+ .fontRendererObj.drawString("\u2261", x + 10, y + 50 + yOff + ySize / 2f - 4, 0xffffff, true);
}
yOff += ySize;
@@ -164,27 +137,9 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
int outline = 0xff404046;
Gui.drawRect(left, top, left + 1, top + dropdownHeight, outline); //Left
Gui.drawRect(left + 1, top, left + dropdownWidth, top + 1, outline); //Top
- Gui.drawRect(
- left + dropdownWidth - 1,
- top + 1,
- left + dropdownWidth,
- top + dropdownHeight,
- outline
- ); //Right
- Gui.drawRect(
- left + 1,
- top + dropdownHeight - 1,
- left + dropdownWidth - 1,
- top + dropdownHeight,
- outline
- ); //Bottom
- Gui.drawRect(
- left + 1,
- top + 1,
- left + dropdownWidth - 1,
- top + dropdownHeight - 1,
- main
- ); //Middle
+ Gui.drawRect(left + dropdownWidth - 1, top + 1, left + dropdownWidth, top + dropdownHeight, outline); //Right
+ Gui.drawRect(left + 1, top + dropdownHeight - 1, left + dropdownWidth - 1, top + dropdownHeight, outline); //Bottom
+ Gui.drawRect(left + 1, top + 1, left + dropdownWidth - 1, top + dropdownHeight - 1, main); //Middle
int dropdownY = -1;
for (int strIndex : remaining) {
@@ -207,26 +162,17 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
int opacity = 0x80;
long currentTime = System.currentTimeMillis();
if (trashHoverTime < 0) {
- float greenBlue = LerpUtils.clampZeroOne(
- (currentTime + trashHoverTime) / 250f
- );
+ float greenBlue = LerpUtils.clampZeroOne((currentTime + trashHoverTime) / 250f);
opacity = (int) (opacity * greenBlue);
} else {
- float greenBlue = LerpUtils.clampZeroOne(
- (250 + trashHoverTime - currentTime) / 250f
- );
+ float greenBlue = LerpUtils.clampZeroOne((250 + trashHoverTime - currentTime) / 250f);
opacity = (int) (opacity * greenBlue);
}
if (opacity < 20) return;
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
- int mouseX =
- Mouse.getX() *
- scaledResolution.getScaledWidth() /
- Minecraft.getMinecraft().displayWidth;
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+ int mouseX = Mouse.getX() * scaledResolution.getScaledWidth() / Minecraft.getMinecraft().displayWidth;
int mouseY =
scaledResolution.getScaledHeight() -
Mouse.getY() *
@@ -239,11 +185,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
String[] multilines = str.split("\n");
GlStateManager.enableBlend();
- for (
- int multilineIndex = 0;
- multilineIndex < multilines.length;
- multilineIndex++
- ) {
+ for (int multilineIndex = 0; multilineIndex < multilines.length; multilineIndex++) {
String line = multilines[multilineIndex];
Utils.drawStringScaledMaxWidth(
line + EnumChatFormatting.RESET,
@@ -291,8 +233,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
if (!Mouse.isButtonDown(0) || dropdownOpen) {
currentDragging = -1;
dragStartIndex = -1;
- if (trashHoverTime > 0) trashHoverTime =
- -System.currentTimeMillis();
+ if (trashHoverTime > 0) trashHoverTime = -System.currentTimeMillis();
} else if (
currentDragging >= 0 &&
mouseX >= x + width / 6 + 27 - 3 &&
@@ -302,8 +243,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
) {
if (trashHoverTime < 0) trashHoverTime = System.currentTimeMillis();
} else {
- if (trashHoverTime > 0) trashHoverTime =
- -System.currentTimeMillis();
+ if (trashHoverTime > 0) trashHoverTime = -System.currentTimeMillis();
}
if (Mouse.getEventButtonState()) {
@@ -322,12 +262,7 @@ public class GuiOptionEditorDraggableList extends GuiOptionEditor {
int dropdownHeight = -1 + 12 * remaining.size();
- if (
- mouseX > left &&
- mouseX < left + dropdownWidth &&
- mouseY > top &&
- mouseY < top + dropdownHeight
- ) {
+ if (mouseX > left && mouseX < left + dropdownWidth && mouseY > top && mouseY < top + dropdownHeight) {
int dropdownY = -1;
for (int strIndex : remaining) {
if (mouseY < top + dropdownY + 12) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java
index 8aa5c08..43a04d7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java
@@ -47,13 +47,7 @@ public class GuiOptionEditorDropdown extends GuiOptionEditor {
selectedString = values[selected];
}
- RenderUtils.drawFloatingRectDark(
- left,
- top,
- dropdownWidth,
- 14,
- false
- );
+ RenderUtils.drawFloatingRectDark(left, top, dropdownWidth, 14, false);
TextRenderUtils.drawStringScaled(
"\u25BC",
fr,
@@ -97,35 +91,11 @@ public class GuiOptionEditorDropdown extends GuiOptionEditor {
int blue = 0xff2355ad;
Gui.drawRect(left, top, left + 1, top + dropdownHeight, blue); //Left
Gui.drawRect(left + 1, top, left + dropdownWidth, top + 1, blue); //Top
- Gui.drawRect(
- left + dropdownWidth - 1,
- top + 1,
- left + dropdownWidth,
- top + dropdownHeight,
- blue
- ); //Right
- Gui.drawRect(
- left + 1,
- top + dropdownHeight - 1,
- left + dropdownWidth - 1,
- top + dropdownHeight,
- blue
- ); //Bottom
- Gui.drawRect(
- left + 1,
- top + 1,
- left + dropdownWidth - 1,
- top + dropdownHeight - 1,
- main
- ); //Middle
-
- Gui.drawRect(
- left + 1,
- top + 14 - 1,
- left + dropdownWidth - 1,
- top + 14,
- blue
- ); //Bar
+ Gui.drawRect(left + dropdownWidth - 1, top + 1, left + dropdownWidth, top + dropdownHeight, blue); //Right
+ Gui.drawRect(left + 1, top + dropdownHeight - 1, left + dropdownWidth - 1, top + dropdownHeight, blue); //Bottom
+ Gui.drawRect(left + 1, top + 1, left + dropdownWidth - 1, top + dropdownHeight - 1, main); //Middle
+
+ Gui.drawRect(left + 1, top + 14 - 1, left + dropdownWidth - 1, top + 14, blue); //Bar
int dropdownY = 13;
for (String option : values) {
@@ -174,12 +144,7 @@ public class GuiOptionEditorDropdown extends GuiOptionEditor {
int top = y + height - 7 - 14;
if (Mouse.getEventButtonState() && Mouse.getEventButton() == 0) {
- if (
- mouseX >= left &&
- mouseX <= left + 80 &&
- mouseY >= top &&
- mouseY <= top + 14
- ) {
+ if (mouseX >= left && mouseX <= left + 80 && mouseY >= top && mouseY <= top + 14) {
open = !open;
return true;
}
@@ -189,36 +154,19 @@ public class GuiOptionEditorDropdown extends GuiOptionEditor {
}
@Override
- public boolean mouseInputOverlay(
- int x,
- int y,
- int width,
- int mouseX,
- int mouseY
- ) {
+ public boolean mouseInputOverlay(int x, int y, int width, int mouseX, int mouseY) {
int height = getHeight();
int left = x + width / 6 - 40;
int top = y + height - 7 - 14;
if (Mouse.getEventButtonState() && Mouse.getEventButton() == 0) {
- if (
- !(
- mouseX >= left &&
- mouseX <= left + 80 &&
- mouseY >= top &&
- mouseY <= top + 14
- ) &&
- open
- ) {
+ if (!(mouseX >= left && mouseX <= left + 80 && mouseY >= top && mouseY <= top + 14) && open) {
open = false;
if (mouseX >= left && mouseX <= left + 80) {
int dropdownY = 13;
for (int ordinal = 0; ordinal < values.length; ordinal++) {
- if (
- mouseY >= top + 3 + dropdownY &&
- mouseY <= top + 3 + dropdownY + 12
- ) {
+ if (mouseY >= top + 3 + dropdownY && mouseY <= top + 3 + dropdownY + 12) {
selected = ordinal;
if (useOrdinal) {
option.set(selected);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java
index dd981d8..2932e34 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java
@@ -33,9 +33,7 @@ public class GuiOptionEditorSlider extends GuiOptionEditor {
textField =
new GuiElementTextField(
strVal,
- GuiElementTextField.NO_SPACE |
- GuiElementTextField.NUM_ONLY |
- GuiElementTextField.SCALE_TEXT
+ GuiElementTextField.NO_SPACE | GuiElementTextField.NUM_ONLY | GuiElementTextField.SCALE_TEXT
);
}
@@ -56,8 +54,7 @@ public class GuiOptionEditorSlider extends GuiOptionEditor {
strVal = Integer.toString(val.intValue());
} else {
strVal = Float.toString(val);
- strVal =
- strVal.replaceAll("(\\.\\d\\d\\d)(?:\\d)+", "$1");
+ strVal = strVal.replaceAll("(\\.\\d\\d\\d)(?:\\d)+", "$1");
strVal = strVal.replaceAll("0+$", "");
}
textField.setText(strVal);
@@ -80,29 +77,16 @@ public class GuiOptionEditorSlider extends GuiOptionEditor {
slider.render();
if (textField.getFocus()) {
- textField.setOptions(
- GuiElementTextField.NO_SPACE | GuiElementTextField.NUM_ONLY
- );
- textField.setSize(
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(textField.getText()) +
- 10,
- 16
- );
+ textField.setOptions(GuiElementTextField.NO_SPACE | GuiElementTextField.NUM_ONLY);
+ textField.setSize(Minecraft.getMinecraft().fontRendererObj.getStringWidth(textField.getText()) + 10, 16);
} else {
textField.setSize(textFieldWidth, 16);
textField.setOptions(
- GuiElementTextField.NO_SPACE |
- GuiElementTextField.NUM_ONLY |
- GuiElementTextField.SCALE_TEXT
+ GuiElementTextField.NO_SPACE | GuiElementTextField.NUM_ONLY | GuiElementTextField.SCALE_TEXT
);
}
- textField.render(
- x + width / 6 - fullWidth / 2 + sliderWidth + 5,
- y + height - 7 - 14
- );
+ textField.render(x + width / 6 - fullWidth / 2 + sliderWidth + 5, y + height - 7 - 14);
}
@Override
@@ -122,21 +106,14 @@ public class GuiOptionEditorSlider extends GuiOptionEditor {
}
if (textField.getFocus()) {
- textFieldWidth =
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(textField.getText()) +
- 10;
+ textFieldWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textField.getText()) + 10;
}
int textFieldX = x + width / 6 - fullWidth / 2 + sliderWidth + 5;
int textFieldY = y + height - 7 - 14;
textField.setSize(textFieldWidth, 16);
- if (
- Mouse.getEventButtonState() &&
- (Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1)
- ) {
+ if (Mouse.getEventButtonState() && (Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1)) {
if (
mouseX > textFieldX &&
mouseX < textFieldX + textFieldWidth &&
@@ -155,10 +132,7 @@ public class GuiOptionEditorSlider extends GuiOptionEditor {
@Override
public boolean keyboardInput() {
if (Keyboard.getEventKeyState() && textField.getFocus()) {
- textField.keyTyped(
- Keyboard.getEventCharacter(),
- Keyboard.getEventKey()
- );
+ textField.keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey());
try {
textField.setCustomBorderColour(0xffffffff);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java
index 3e712f2..da39ca1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java
@@ -27,13 +27,7 @@ public class GuiOptionEditorText extends GuiOptionEditor {
int textFieldX = x + width / 6 - fullWidth / 2;
if (textField.getFocus()) {
fullWidth =
- Math.max(
- fullWidth,
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(textField.getText()) +
- 10
- );
+ Math.max(fullWidth, Minecraft.getMinecraft().fontRendererObj.getStringWidth(textField.getText()) + 10);
}
textField.setSize(fullWidth, 16);
@@ -51,22 +45,13 @@ public class GuiOptionEditorText extends GuiOptionEditor {
if (textField.getFocus()) {
fullWidth =
- Math.max(
- fullWidth,
- Minecraft
- .getMinecraft()
- .fontRendererObj.getStringWidth(textField.getText()) +
- 10
- );
+ Math.max(fullWidth, Minecraft.getMinecraft().fontRendererObj.getStringWidth(textField.getText()) + 10);
}
int textFieldY = y + height - 7 - 14;
textField.setSize(fullWidth, 16);
- if (
- Mouse.getEventButtonState() &&
- (Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1)
- ) {
+ if (Mouse.getEventButtonState() && (Mouse.getEventButton() == 0 || Mouse.getEventButton() == 1)) {
if (
mouseX > textFieldX &&
mouseX < textFieldX + fullWidth &&
@@ -86,10 +71,7 @@ public class GuiOptionEditorText extends GuiOptionEditor {
public boolean keyboardInput() {
if (Keyboard.getEventKeyState() && textField.getFocus()) {
Keyboard.enableRepeatEvents(true);
- textField.keyTyped(
- Keyboard.getEventCharacter(),
- Keyboard.getEventKey()
- );
+ textField.keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey());
try {
textField.setCustomBorderColour(0xffffffff);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java
index eaa399e..0fae02e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java
@@ -67,28 +67,13 @@ public class GuiPositionEditor extends GuiScreen {
this.width = scaledResolution.getScaledWidth();
this.height = scaledResolution.getScaledHeight();
mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
- mouseY =
- height -
- Mouse.getY() *
- height /
- Minecraft.getMinecraft().displayHeight -
- 1;
+ mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
drawDefaultBackground();
if (clicked) {
- grabbedX +=
- position.moveX(
- mouseX - grabbedX,
- elementWidth,
- scaledResolution
- );
- grabbedY +=
- position.moveY(
- mouseY - grabbedY,
- elementHeight,
- scaledResolution
- );
+ grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+ grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
}
renderCallback.run();
@@ -124,8 +109,7 @@ public class GuiPositionEditor extends GuiScreen {
}
@Override
- protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
- throws IOException {
+ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
super.mouseClicked(mouseX, mouseY, mouseButton);
if (mouseButton == 0) {
@@ -133,29 +117,17 @@ public class GuiPositionEditor extends GuiScreen {
if (guiScaleOverride >= 0) {
scaledResolution = Utils.pushGuiScale(guiScaleOverride);
} else {
- scaledResolution =
- new ScaledResolution(Minecraft.getMinecraft());
+ scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
}
- mouseX =
- Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
- mouseY =
- height -
- Mouse.getY() *
- height /
- Minecraft.getMinecraft().displayHeight -
- 1;
+ mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+ mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
int x = position.getAbsX(scaledResolution, elementWidth);
int y = position.getAbsY(scaledResolution, elementHeight);
if (position.isCenterX()) x -= elementWidth / 2;
if (position.isCenterY()) y -= elementHeight / 2;
- if (
- mouseX >= x &&
- mouseY >= y &&
- mouseX <= x + elementWidth &&
- mouseY <= y + elementHeight
- ) {
+ if (mouseX >= x && mouseY >= y && mouseX <= x + elementWidth && mouseY <= y + elementHeight) {
clicked = true;
grabbedX = mouseX;
grabbedY = mouseY;
@@ -174,34 +146,16 @@ public class GuiPositionEditor extends GuiScreen {
if (keyCode == Keyboard.KEY_R) {
position.set(originalPosition);
} else if (!clicked) {
- boolean shiftHeld =
- Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ||
- Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+ boolean shiftHeld = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
int dist = shiftHeld ? 10 : 1;
if (keyCode == Keyboard.KEY_DOWN) {
- position.moveY(
- dist,
- elementHeight,
- new ScaledResolution(Minecraft.getMinecraft())
- );
+ position.moveY(dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
} else if (keyCode == Keyboard.KEY_UP) {
- position.moveY(
- -dist,
- elementHeight,
- new ScaledResolution(Minecraft.getMinecraft())
- );
+ position.moveY(-dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
} else if (keyCode == Keyboard.KEY_LEFT) {
- position.moveX(
- -dist,
- elementWidth,
- new ScaledResolution(Minecraft.getMinecraft())
- );
+ position.moveX(-dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
} else if (keyCode == Keyboard.KEY_RIGHT) {
- position.moveX(
- dist,
- elementWidth,
- new ScaledResolution(Minecraft.getMinecraft())
- );
+ position.moveX(dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
}
}
super.keyTyped(typedChar, keyCode);
@@ -214,48 +168,21 @@ public class GuiPositionEditor extends GuiScreen {
}
@Override
- protected void mouseClickMove(
- int mouseX,
- int mouseY,
- int clickedMouseButton,
- long timeSinceLastClick
- ) {
- super.mouseClickMove(
- mouseX,
- mouseY,
- clickedMouseButton,
- timeSinceLastClick
- );
+ protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+ super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
if (clicked) {
ScaledResolution scaledResolution;
if (guiScaleOverride >= 0) {
scaledResolution = Utils.pushGuiScale(guiScaleOverride);
} else {
- scaledResolution =
- new ScaledResolution(Minecraft.getMinecraft());
+ scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
}
- mouseX =
- Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
- mouseY =
- height -
- Mouse.getY() *
- height /
- Minecraft.getMinecraft().displayHeight -
- 1;
+ mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+ mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
- grabbedX +=
- position.moveX(
- mouseX - grabbedX,
- elementWidth,
- scaledResolution
- );
- grabbedY +=
- position.moveY(
- mouseY - grabbedY,
- elementHeight,
- scaledResolution
- );
+ grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+ grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
positionChangedCallback.run();
if (guiScaleOverride >= 0) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java b/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java
index 559fa9e..e989b61 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java
@@ -35,13 +35,7 @@ public class ConfigProcessor {
private final Field field;
private final Object container;
- public ProcessedOption(
- String name,
- String desc,
- int subcategoryId,
- Field field,
- Object container
- ) {
+ public ProcessedOption(String name, String desc, int subcategoryId, Field field, Object container) {
this.name = name;
this.desc = desc;
this.subcategoryId = subcategoryId;
@@ -73,17 +67,11 @@ public class ConfigProcessor {
}
}
- public static LinkedHashMap<String, ProcessedCategory> create(
- Config config
- ) {
+ public static LinkedHashMap<String, ProcessedCategory> create(Config config) {
LinkedHashMap<String, ProcessedCategory> processedConfig = new LinkedHashMap<>();
for (Field categoryField : config.getClass().getDeclaredFields()) {
- boolean exposePresent = categoryField.isAnnotationPresent(
- Expose.class
- );
- boolean categoryPresent = categoryField.isAnnotationPresent(
- Category.class
- );
+ boolean exposePresent = categoryField.isAnnotationPresent(Expose.class);
+ boolean categoryPresent = categoryField.isAnnotationPresent(Category.class);
if (exposePresent && categoryPresent) {
Object categoryObj;
@@ -94,26 +82,15 @@ public class ConfigProcessor {
continue;
}
- Category categoryAnnotation = categoryField.getAnnotation(
- Category.class
- );
- ProcessedCategory cat = new ProcessedCategory(
- categoryAnnotation.name(),
- categoryAnnotation.desc()
- );
+ Category categoryAnnotation = categoryField.getAnnotation(Category.class);
+ ProcessedCategory cat = new ProcessedCategory(categoryAnnotation.name(), categoryAnnotation.desc());
processedConfig.put(categoryField.getName(), cat);
- for (Field optionField : categoryObj
- .getClass()
- .getDeclaredFields()) {
- boolean optionPresent = optionField.isAnnotationPresent(
- ConfigOption.class
- );
+ for (Field optionField : categoryObj.getClass().getDeclaredFields()) {
+ boolean optionPresent = optionField.isAnnotationPresent(ConfigOption.class);
if (optionPresent) {
- ConfigOption optionAnnotation = optionField.getAnnotation(
- ConfigOption.class
- );
+ ConfigOption optionAnnotation = optionField.getAnnotation(ConfigOption.class);
ProcessedOption option = new ProcessedOption(
optionAnnotation.name(),
optionAnnotation.desc(),
@@ -121,24 +98,14 @@ public class ConfigProcessor {
optionField,
categoryObj
);
- if (
- optionField.isAnnotationPresent(
- ConfigAccordionId.class
- )
- ) {
- ConfigAccordionId annotation = optionField.getAnnotation(
- ConfigAccordionId.class
- );
+ if (optionField.isAnnotationPresent(ConfigAccordionId.class)) {
+ ConfigAccordionId annotation = optionField.getAnnotation(ConfigAccordionId.class);
option.accordionId = annotation.id();
}
GuiOptionEditor editor = null;
Class<?> optionType = optionField.getType();
- if (
- optionField.isAnnotationPresent(
- ConfigEditorButton.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorButton.class)) {
ConfigEditorButton configEditorAnnotation = optionField.getAnnotation(
ConfigEditorButton.class
);
@@ -152,33 +119,21 @@ public class ConfigProcessor {
}
if (
optionType.isAssignableFrom(boolean.class) &&
- optionField.isAnnotationPresent(
- ConfigEditorBoolean.class
- )
+ optionField.isAnnotationPresent(ConfigEditorBoolean.class)
) {
editor = new GuiOptionEditorBoolean(option);
}
if (
optionType.isAssignableFrom(boolean.class) &&
- optionField.isAnnotationPresent(
- ConfigEditorAccordion.class
- )
+ optionField.isAnnotationPresent(ConfigEditorAccordion.class)
) {
ConfigEditorAccordion configEditorAnnotation = optionField.getAnnotation(
ConfigEditorAccordion.class
);
- editor =
- new GuiOptionEditorAccordion(
- option,
- configEditorAnnotation.id()
- );
+ editor = new GuiOptionEditorAccordion(option, configEditorAnnotation.id());
}
if (optionType.isAssignableFrom(int.class)) {
- if (
- optionField.isAnnotationPresent(
- ConfigEditorDropdown.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorDropdown.class)) {
ConfigEditorDropdown configEditorAnnotation = optionField.getAnnotation(
ConfigEditorDropdown.class
);
@@ -192,27 +147,15 @@ public class ConfigProcessor {
}
}
if (optionType.isAssignableFrom(List.class)) {
- if (
- optionField.isAnnotationPresent(
- ConfigEditorDraggableList.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorDraggableList.class)) {
ConfigEditorDraggableList configEditorAnnotation = optionField.getAnnotation(
ConfigEditorDraggableList.class
);
- editor =
- new GuiOptionEditorDraggableList(
- option,
- configEditorAnnotation.exampleText()
- );
+ editor = new GuiOptionEditorDraggableList(option, configEditorAnnotation.exampleText());
}
}
if (optionType.isAssignableFrom(String.class)) {
- if (
- optionField.isAnnotationPresent(
- ConfigEditorDropdown.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorDropdown.class)) {
ConfigEditorDropdown configEditorAnnotation = optionField.getAnnotation(
ConfigEditorDropdown.class
);
@@ -223,17 +166,9 @@ public class ConfigProcessor {
configEditorAnnotation.initialIndex(),
false
);
- } else if (
- optionField.isAnnotationPresent(
- ConfigEditorColour.class
- )
- ) {
+ } else if (optionField.isAnnotationPresent(ConfigEditorColour.class)) {
editor = new GuiOptionEditorColour(option);
- } else if (
- optionField.isAnnotationPresent(
- ConfigEditorText.class
- )
- ) {
+ } else if (optionField.isAnnotationPresent(ConfigEditorText.class)) {
editor = new GuiOptionEditorText(option);
}
}
@@ -242,11 +177,7 @@ public class ConfigProcessor {
optionType.isAssignableFrom(float.class) ||
optionType.isAssignableFrom(double.class)
) {
- if (
- optionField.isAnnotationPresent(
- ConfigEditorSlider.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorSlider.class)) {
ConfigEditorSlider configEditorAnnotation = optionField.getAnnotation(
ConfigEditorSlider.class
);
@@ -260,21 +191,11 @@ public class ConfigProcessor {
}
}
if (optionType.isAssignableFrom(String.class)) {
- if (
- optionField.isAnnotationPresent(
- ConfigEditorDropdown.class
- )
- ) {
+ if (optionField.isAnnotationPresent(ConfigEditorDropdown.class)) {
ConfigEditorDropdown configEditorAnnotation = optionField.getAnnotation(
ConfigEditorDropdown.class
);
- editor =
- new GuiOptionEditorDropdown(
- option,
- configEditorAnnotation.values(),
- 0,
- false
- );
+ editor = new GuiOptionEditorDropdown(option, configEditorAnnotation.values(), 0, false);
}
}
if (editor == null) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java
index cdd745d..fd7d3b3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java
@@ -55,13 +55,8 @@ public class GuiElementSlider extends GuiElement {
@Override
public void render() {
- final ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
- int mouseX =
- Mouse.getX() *
- scaledResolution.getScaledWidth() /
- Minecraft.getMinecraft().displayWidth;
+ final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+ int mouseX = Mouse.getX() * scaledResolution.getScaledWidth() / Minecraft.getMinecraft().displayWidth;
float value = this.value;
if (clicked) {
@@ -70,47 +65,23 @@ public class GuiElementSlider extends GuiElement {
value = Math.round(value / minStep) * minStep;
}
- float sliderAmount = Math.max(
- 0,
- Math.min(1, (value - minValue) / (maxValue - minValue))
- );
+ float sliderAmount = Math.max(0, Math.min(1, (value - minValue) / (maxValue - minValue)));
int sliderAmountI = (int) (width * sliderAmount);
GlStateManager.color(1f, 1f, 1f, 1f);
Minecraft.getMinecraft().getTextureManager().bindTexture(slider_on_cap);
Utils.drawTexturedRect(x, y, 4, HEIGHT, GL11.GL_NEAREST);
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(slider_off_cap);
+ Minecraft.getMinecraft().getTextureManager().bindTexture(slider_off_cap);
Utils.drawTexturedRect(x + width - 4, y, 4, HEIGHT, GL11.GL_NEAREST);
if (sliderAmountI > 5) {
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(slider_on_segment);
- Utils.drawTexturedRect(
- x + 4,
- y,
- sliderAmountI - 4,
- HEIGHT,
- GL11.GL_NEAREST
- );
+ Minecraft.getMinecraft().getTextureManager().bindTexture(slider_on_segment);
+ Utils.drawTexturedRect(x + 4, y, sliderAmountI - 4, HEIGHT, GL11.GL_NEAREST);
}
if (sliderAmountI < width - 5) {
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(slider_off_segment);
- Utils.drawTexturedRect(
- x + sliderAmountI,
- y,
- width - 4 - sliderAmountI,
- HEIGHT,
- GL11.GL_NEAREST
- );
+ Minecraft.getMinecraft().getTextureManager().bindTexture(slider_off_segment);
+ Utils.drawTexturedRect(x + sliderAmountI, y, width - 4 - sliderAmountI, HEIGHT, GL11.GL_NEAREST);
}
for (int i = 1; i < 4; i++) {
@@ -118,31 +89,12 @@ public class GuiElementSlider extends GuiElement {
Minecraft
.getMinecraft()
.getTextureManager()
- .bindTexture(
- notchX > x + sliderAmountI
- ? slider_off_notch
- : slider_on_notch
- );
- Utils.drawTexturedRect(
- notchX,
- y + (HEIGHT - 4) / 2f,
- 2,
- 4,
- GL11.GL_NEAREST
- );
+ .bindTexture(notchX > x + sliderAmountI ? slider_off_notch : slider_on_notch);
+ Utils.drawTexturedRect(notchX, y + (HEIGHT - 4) / 2f, 2, 4, GL11.GL_NEAREST);
}
- Minecraft
- .getMinecraft()
- .getTextureManager()
- .bindTexture(slider_button_new);
- Utils.drawTexturedRect(
- x + sliderAmountI - 4,
- y,
- 8,
- HEIGHT,
- GL11.GL_NEAREST
- );
+ Minecraft.getMinecraft().getTextureManager().bindTexture(slider_button_new);
+ Utils.drawTexturedRect(x + sliderAmountI - 4, y, 8, HEIGHT, GL11.GL_NEAREST);
}
@Override
@@ -153,26 +105,17 @@ public class GuiElementSlider extends GuiElement {
if (Mouse.getEventButton() == 0) {
clicked =
- Mouse.getEventButtonState() &&
- mouseX > x &&
- mouseX < x + width &&
- mouseY > y &&
- mouseY < y + HEIGHT;
+ Mouse.getEventButtonState() && mouseX > x && mouseX < x + width && mouseY > y && mouseY < y + HEIGHT;
if (clicked) {
value = (mouseX - x) * (maxValue - minValue) / width + minValue;
value = Math.max(minValue, Math.min(maxValue, value));
- value =
- (float) (Math.round(value / minStep) * (double) minStep);
+ value = (float) (Math.round(value / minStep) * (double) minStep);
setCallback.accept(value);
return true;
}
}
- if (
- !Mouse.getEventButtonState() &&
- Mouse.getEventButton() == -1 &&
- clicked
- ) {
+ if (!Mouse.getEventButtonState() && Mouse.getEventButton() == -1 && clicked) {
value = (mouseX - x) * (maxValue - minValue) / width + minValue;
value = Math.max(minValue, Math.min(maxValue, value));
value = Math.round(value / minStep) * minStep;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java
index 4173694..5c59853 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java
@@ -21,10 +21,7 @@ import org.lwjgl.input.Mouse;
public class MiscUtils {
public static void copyToClipboard(String str) {
- Toolkit
- .getDefaultToolkit()
- .getSystemClipboard()
- .setContents(new StringSelection(str), null);
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(str), null);
}
private static void unzip(InputStream src, File dest) {
@@ -79,52 +76,28 @@ public class MiscUtils {
} catch (Exception ignored) {}
}
- public static void setCursor(
- ResourceLocation loc,
- int hotspotX,
- int hotspotY
- ) {
- if (
- currentCursor != null && loc.getResourcePath().equals(currentCursor)
- ) {
+ public static void setCursor(ResourceLocation loc, int hotspotX, int hotspotY) {
+ if (currentCursor != null && loc.getResourcePath().equals(currentCursor)) {
return;
}
currentCursor = loc.getResourcePath();
try {
BufferedImage image = ImageIO.read(
- Minecraft
- .getMinecraft()
- .getResourceManager()
- .getResource(loc)
- .getInputStream()
+ Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream()
);
int maxSize = Cursor.getMaxCursorSize();
IntBuffer buffer = BufferUtils.createIntBuffer(maxSize * maxSize);
for (int i = 0; i < maxSize * maxSize; i++) {
int cursorX = i % maxSize;
int cursorY = i / maxSize;
- if (
- cursorX >= image.getWidth() || cursorY >= image.getHeight()
- ) {
+ if (cursorX >= image.getWidth() || cursorY >= image.getHeight()) {
buffer.put(0x00000000);
} else {
- buffer.put(
- image.getRGB(cursorX, image.getHeight() - 1 - cursorY)
- );
+ buffer.put(image.getRGB(cursorX, image.getHeight() - 1 - cursorY));
}
}
buffer.flip();
- Mouse.setNativeCursor(
- new Cursor(
- maxSize,
- maxSize,
- hotspotX,
- hotspotY,
- 1,
- buffer,
- null
- )
- );
+ Mouse.setNativeCursor(new Cursor(maxSize, maxSize, hotspotX, hotspotY, 1, buffer, null));
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java
index 48c7566..5b34cb1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java
@@ -7,10 +7,7 @@ import net.minecraft.client.gui.FontRenderer;
public class StringUtils {
- public static final Set<String> PROTOCOLS = Sets.newHashSet(
- "http",
- "https"
- );
+ public static final Set<String> PROTOCOLS = Sets.newHashSet("http", "https");
public static String cleanColour(String in) {
return in.replaceAll("(?i)\\u00A7.", "");
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java
index b24bbe6..1b88f5a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java
@@ -11,10 +11,8 @@ public class LerpUtils {
}
private static final float sigmoidStr = 8;
- private static final float sigmoidA =
- -1 / (sigmoid(-0.5f * sigmoidStr) - sigmoid(0.5f * sigmoidStr));
- private static final float sigmoidB =
- sigmoidA * sigmoid(-0.5f * sigmoidStr);
+ private static final float sigmoidA = -1 / (sigmoid(-0.5f * sigmoidStr) - sigmoid(0.5f * sigmoidStr));
+ private static final float sigmoidB = sigmoidA * sigmoid(-0.5f * sigmoidStr);
public static float sigmoidZeroOne(float f) {
f = clampZeroOne(f);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java
index 9e379c7..edf129b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java
@@ -22,8 +22,7 @@ public class LerpingFloat {
int lastTimeSpent = timeSpent;
this.timeSpent += System.currentTimeMillis() - lastMillis;
- float lastDistPercentToTarget =
- lastTimeSpent / (float) timeToReachTarget;
+ float lastDistPercentToTarget = lastTimeSpent / (float) timeToReachTarget;
float distPercentToTarget = timeSpent / (float) timeToReachTarget;
float fac = (1 - lastDistPercentToTarget) / lastDistPercentToTarget;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java
index 63e7143..0bae869 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java
@@ -22,8 +22,7 @@ public class LerpingInteger {
int lastTimeSpent = timeSpent;
this.timeSpent += System.currentTimeMillis() - lastMillis;
- float lastDistPercentToTarget =
- lastTimeSpent / (float) timeToReachTarget;
+ float lastDistPercentToTarget = lastTimeSpent / (float) timeToReachTarget;
float distPercentToTarget = timeSpent / (float) timeToReachTarget;
float fac = (1 - lastDistPercentToTarget) / lastDistPercentToTarget;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java
index 242166b..518b928 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java
@@ -14,28 +14,15 @@ import org.lwjgl.opengl.GL14;
public class RenderUtils {
- public static void drawFloatingRectDark(
- int x,
- int y,
- int width,
- int height
- ) {
+ public static void drawFloatingRectDark(int x, int y, int width, int height) {
drawFloatingRectDark(x, y, width, height, true);
}
- public static void drawFloatingRectDark(
- int x,
- int y,
- int width,
- int height,
- boolean shadow
- ) {
+ public static void drawFloatingRectDark(int x, int y, int width, int height, boolean shadow) {
int alpha = 0xf0000000;
if (OpenGlHelper.isFramebufferEnabled()) {
- ScaledResolution scaledResolution = new ScaledResolution(
- Minecraft.getMinecraft()
- );
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
BackgroundBlur.renderBlurredBackground(
15,
scaledResolution.getScaledWidth(),
@@ -59,20 +46,8 @@ public class RenderUtils {
Gui.drawRect(x + 1, y + height - 1, x + width - 1, y + height, dark); //Bottom
Gui.drawRect(x + 1, y + 1, x + width - 1, y + height - 1, main); //Middle
if (shadow) {
- Gui.drawRect(
- x + width,
- y + 2,
- x + width + 2,
- y + height + 2,
- 0x70000000
- ); //Right shadow
- Gui.drawRect(
- x + 2,
- y + height,
- x + width,
- y + height + 2,
- 0x70000000
- ); //Bottom shadow
+ Gui.drawRect(x + width, y + 2, x + width + 2, y + height + 2, 0x70000000); //Right shadow
+ Gui.drawRect(x + 2, y + height, x + width, y + height + 2, 0x70000000); //Bottom shadow
}
}
@@ -80,14 +55,7 @@ public class RenderUtils {
drawFloatingRectWithAlpha(x, y, width, height, 0xFF, true);
}
- public static void drawFloatingRectWithAlpha(
- int x,
- int y,
- int width,
- int height,
- int alpha,
- boolean shadow
- ) {
+ public static void drawFloatingRectWithAlpha(int x, int y, int width, int height, int alpha, boolean shadow) {
int main = (alpha << 24) | 0xc0c0c0;
int light = (alpha << 24) | 0xf0f0f0;
int dark = (alpha << 24) | 0x909090;
@@ -97,71 +65,29 @@ public class RenderUtils {
Gui.drawRect(x + 1, y + height - 1, x + width - 1, y + height, dark); //Bottom
Gui.drawRect(x + 1, y + 1, x + width - 1, y + height - 1, main); //Middle
if (shadow) {
- Gui.drawRect(
- x + width,
- y + 2,
- x + width + 2,
- y + height + 2,
- (alpha * 3 / 5) << 24
- ); //Right shadow
- Gui.drawRect(
- x + 2,
- y + height,
- x + width,
- y + height + 2,
- (alpha * 3 / 5) << 24
- ); //Bottom shadow
+ Gui.drawRect(x + width, y + 2, x + width + 2, y + height + 2, (alpha * 3 / 5) << 24); //Right shadow
+ Gui.drawRect(x + 2, y + height, x + width, y + height + 2, (alpha * 3 / 5) << 24); //Bottom shadow
}
}
- public static void drawTexturedModalRect(
- int x,
- int y,
- int textureX,
- int textureY,
- int width,
- int height
- ) {
+ public static void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) {
double f = 0.00390625;
double f1 = 0.00390625;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
- worldrenderer
- .pos(x + 0.0, y + height, 0.0)
- .tex((textureX + 0.0) * f, (textureY + height) * f1)
- .endVertex();
- worldrenderer
- .pos(x + width, y + height, 0.0)
- .tex((textureX + width) * f, (textureY + height) * f1)
- .endVertex();
- worldrenderer
- .pos(x + width, y + 0.0, 0.0)
- .tex((textureX + width) * f, (textureY + 0.0) * f1)
- .endVertex();
- worldrenderer
- .pos(x + 0.0, y + 0.0, 0.0)
- .tex((textureX + 0.0) * f, (textureY + 0.0) * f1)
- .endVertex();
+ worldrenderer.pos(x + 0.0, y + height, 0.0).tex((textureX + 0.0) * f, (textureY + height) * f1).endVertex();
+ worldrenderer.pos(x + width, y + height, 0.0).tex((textureX + width) * f, (textureY + height) * f1).endVertex();
+ worldrenderer.pos(x + width, y + 0.0, 0.0).tex((textureX + width) * f, (textureY + 0.0) * f1).endVertex();
+ worldrenderer.pos(x + 0.0, y + 0.0, 0.0).tex((textureX + 0.0) * f, (textureY + 0.0) * f1).endVertex();
tessellator.draw();
}
- public static void drawTexturedRect(
- float x,
- float y,
- float width,
- float height
- ) {
+ public static void drawTexturedRect(float x, float y, float width, float height) {
drawTexturedRect(x, y, width, height, 0, 1, 0, 1);
}
- public static void drawTexturedRect(
- float x,
- float y,
- float width,
- float height,
- int filter
- ) {
+ public static void drawTexturedRect(float x, float y, float width, float height, int filter) {
drawTexturedRect(x, y, width, height, 0, 1, 0, 1, filter);
}
@@ -175,17 +101,7 @@ public class RenderUtils {
float vMin,
float vMax
) {
- drawTexturedRect(
- x,
- y,
- width,
- height,
- uMin,
- uMax,
- vMin,
- vMax,
- GL11.GL_NEAREST
- );
+ drawTexturedRect(x, y, width, height, uMin, uMax, vMin, vMax, GL11.GL_NEAREST);
}
public static void drawTexturedRect(
@@ -207,17 +123,7 @@ public class RenderUtils {
GL11.GL_ONE_MINUS_SRC_ALPHA
);
- drawTexturedRectNoBlend(
- x,
- y,
- width,
- height,
- uMin,
- uMax,
- vMin,
- vMax,
- filter
- );
+ drawTexturedRectNoBlend(x, y, width, height, uMin, uMax, vMin, vMax, filter);
GlStateManager.disableBlend();
}
@@ -235,39 +141,20 @@ public class RenderUtils {
) {
GlStateManager.enableTexture2D();
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MIN_FILTER,
- filter
- );
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MAG_FILTER,
- filter
- );
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, filter);
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, filter);
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
worldrenderer.pos(x, y + height, 0.0D).tex(uMin, vMax).endVertex();
- worldrenderer
- .pos(x + width, y + height, 0.0D)
- .tex(uMax, vMax)
- .endVertex();
+ worldrenderer.pos(x + width, y + height, 0.0D).tex(uMax, vMax).endVertex();
worldrenderer.pos(x + width, y, 0.0D).tex(uMax, vMin).endVertex();
worldrenderer.pos(x, y, 0.0D).tex(uMin, vMin).endVertex();
tessellator.draw();
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MIN_FILTER,
- GL11.GL_NEAREST
- );
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_MAG_FILTER,
- GL11.GL_NEAREST
- );
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
}
public static void drawGradientRect(
@@ -297,22 +184,10 @@ public class RenderUtils {
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
- worldrenderer
- .pos(right, top, zLevel)
- .color(startRed, startGreen, startBlue, startAlpha)
- .endVertex();
- worldrenderer
- .pos(left, top, zLevel)
- .color(startRed, startGreen, startBlue, startAlpha)
- .endVertex();
- worldrenderer
- .pos(left, bottom, zLevel)
- .color(endRed, endGreen, endBlue, endAlpha)
- .endVertex();
- worldrenderer
- .pos(right, bottom, zLevel)
- .color(endRed, endGreen, endBlue, endAlpha)
- .endVertex();
+ worldrenderer.pos(right, top, zLevel).color(startRed, startGreen, startBlue, startAlpha).endVertex();
+ worldrenderer.pos(left, top, zLevel).color(startRed, startGreen, startBlue, startAlpha).endVertex();
+ worldrenderer.pos(left, bottom, zLevel).color(endRed, endGreen, endBlue, endAlpha).endVertex();
+ worldrenderer.pos(right, bottom, zLevel).color(endRed, endGreen, endBlue, endAlpha).endVertex();
tessellator.draw();
GlStateManager.shadeModel(7424);
@@ -325,19 +200,7 @@ public class RenderUtils {
Gui.drawRect(left, top, left + width, top + height, 0x6008080E); //Middle
Gui.drawRect(left, top, left + 1, top + height, 0xff08080E); //Left
Gui.drawRect(left, top, left + width, top + 1, 0xff08080E); //Top
- Gui.drawRect(
- left + width - 1,
- top,
- left + width,
- top + height,
- 0xff28282E
- ); //Right
- Gui.drawRect(
- left,
- top + height - 1,
- left + width,
- top + height,
- 0xff28282E
- ); //Bottom
+ Gui.drawRect(left + width - 1, top, left + width, top + height, 0xff28282E); //Right
+ Gui.drawRect(left, top + height - 1, left + width, top + height, 0xff28282E); //Bottom
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java b/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java
index 4284012..478414e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java
@@ -32,14 +32,7 @@ public class TextRenderUtils {
return height;
}
- public static void drawStringVertical(
- String str,
- FontRenderer fr,
- float x,
- float y,
- boolean shadow,
- int colour
- ) {
+ public static void drawStringVertical(String str, FontRenderer fr, float x, float y, boolean shadow, int colour) {
String format = FontRenderer.getFormatFromString(str);
str = StringUtils.cleanColour(str);
for (int i = 0; i < str.length(); i++) {
@@ -47,13 +40,7 @@ public class TextRenderUtils {
int charHeight = getCharVertLen(c);
int charWidth = fr.getCharWidth(c);
- fr.drawString(
- format + c,
- x + (5 - charWidth) / 2f,
- y - 7 + charHeight,
- colour,
- shadow
- );
+ fr.drawString(format + c, x + (5 - charWidth) / 2f, y - 7 + charHeight, colour, shadow);
y += charHeight + 1.5f;
}
@@ -75,14 +62,7 @@ public class TextRenderUtils {
drawStringScaled(str, fr, x, y, shadow, colour, factor);
}
- public static void drawStringCentered(
- String str,
- FontRenderer fr,
- float x,
- float y,
- boolean shadow,
- int colour
- ) {
+ public static void drawStringCentered(String str, FontRenderer fr, float x, float y, boolean shadow, int colour) {
int strLen = fr.getStringWidth(str);
float x2 = x - strLen / 2f;
@@ -123,15 +103,7 @@ public class TextRenderUtils {
float fontHeight = 8 * factor;
- drawStringScaled(
- str,
- fr,
- x - newLen / 2,
- y - fontHeight / 2,
- shadow,
- colour,
- factor
- );
+ drawStringScaled(str, fr, x - newLen / 2, y - fontHeight / 2, shadow, colour, factor);
}
public static void renderToolTip(
@@ -156,15 +128,7 @@ public class TextRenderUtils {
}
FontRenderer font = stack.getItem().getFontRenderer(stack);
- drawHoveringText(
- list,
- mouseX,
- mouseY,
- screenWidth,
- screenHeight,
- -1,
- font == null ? fontStd : font
- );
+ drawHoveringText(list, mouseX, mouseY, screenWidth, screenHeight, -1, font == null ? fontStd : font);
}
public static void drawHoveringText(
@@ -217,10 +181,7 @@ public class TextRenderUtils {
List<String> wrappedTextLines = new ArrayList<String>();
for (int i = 0; i < textLines.size(); i++) {
String textLine = textLines.get(i);
- List<String> wrappedLine = font.listFormattedStringToWidth(
- textLine,
- tooltipTextWidth
- );
+ List<String> wrappedLine = font.listFormattedStringToWidth(textLine, tooltipTextWidth);
if (i == 0) {
titleLinesCount = wrappedLine.size();
}
@@ -305,10 +266,7 @@ public class TextRenderUtils {
backgroundColor
);
final int borderColorStart = 0x505000FF;
- final int borderColorEnd =
- (borderColorStart & 0xFEFEFE) >> 1 |
- borderColorStart &
- 0xFF000000;
+ final int borderColorEnd = (borderColorStart & 0xFEFEFE) >> 1 | borderColorStart & 0xFF000000;
RenderUtils.drawGradientRect(
zLevel,
tooltipX - 3,
@@ -346,18 +304,9 @@ public class TextRenderUtils {
borderColorEnd
);
- for (
- int lineNumber = 0;
- lineNumber < textLines.size();
- ++lineNumber
- ) {
+ for (int lineNumber = 0; lineNumber < textLines.size(); ++lineNumber) {
String line = textLines.get(lineNumber);
- font.drawStringWithShadow(
- line,
- (float) tooltipX,
- (float) tooltipY,
- -1
- );
+ font.drawStringWithShadow(line, (float) tooltipX, (float) tooltipY, -1);
if (lineNumber + 1 == titleLinesCount) {
tooltipY += 2;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java
index f0f58da..b05fe91 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java
@@ -36,9 +36,7 @@ public enum Classes {
} catch (IllegalArgumentException ignored) {}
} else if (input.length() == 3) {
try {
- return Classes.valueOf(
- input.replace("[", "").replace("]", "").toUpperCase()
- );
+ return Classes.valueOf(input.replace("[", "").replace("]", "").toUpperCase());
} catch (IllegalArgumentException ignored) {}
} else {
for (Classes clazz : Classes.values()) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java
index 0c9cb2f..4fd0fd4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java
@@ -24,23 +24,15 @@ public class DungeonHandler {
private static int deaths = 0;
private static int crypts = 0;
- private static final Pattern DungeonPlayerRegex = Pattern.compile(
- "^\\[([HMBAT])] ([\\w]+) ([0-9]+|DEAD)$"
- );
+ private static final Pattern DungeonPlayerRegex = Pattern.compile("^\\[([HMBAT])] ([\\w]+) ([0-9]+|DEAD)$");
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) {
DungeonHandler.checkForDungeonTime(event.formattedLine);
DungeonHandler.checkForDungeonCleared(event.formattedLine);
- DungeonHandler.checkForDungeonKeys(
- event.formattedLine,
- event.rawLine
- );
- DungeonHandler.checkForDungeonPlayers(
- event.formattedLine,
- Minecraft.getMinecraft()
- );
+ DungeonHandler.checkForDungeonKeys(event.formattedLine, event.rawLine);
+ DungeonHandler.checkForDungeonPlayers(event.formattedLine, Minecraft.getMinecraft());
}
}
@@ -57,12 +49,7 @@ public class DungeonHandler {
Classes playerClass = Classes.valueOf(dungeonMatcher.group(1));
String displayName = dungeonMatcher.group(2);
String health = dungeonMatcher.group(3);
- if (
- !mc.thePlayer
- .getName()
- .toLowerCase()
- .startsWith(displayName.toLowerCase().trim())
- ) {
+ if (!mc.thePlayer.getName().toLowerCase().startsWith(displayName.toLowerCase().trim())) {
int healthNum = 0;
if (!health.equalsIgnoreCase("dead")) {
try {
@@ -82,22 +69,12 @@ public class DungeonHandler {
public static void checkForDungeonTime(String scoreLine) {
if (scoreLine.toLowerCase().trim().contains("time elapsed:")) {
- String timeLine = scoreLine
- .toLowerCase()
- .trim()
- .replace("time elapsed:", "");
+ String timeLine = scoreLine.toLowerCase().trim().replace("time elapsed:", "");
String[] times = timeLine.split("m ");
int time = 0;
try {
- time +=
- Integer.parseInt(
- times[0].replace(" ", "").replace("m", "")
- ) *
- 60;
- time +=
- Integer.parseInt(
- times[1].replace(" ", "").replace("s", "")
- );
+ time += Integer.parseInt(times[0].replace(" ", "").replace("m", "")) * 60;
+ time += Integer.parseInt(times[1].replace(" ", "").replace("s", ""));
} catch (NumberFormatException ignored) {}
dungeonTime = time;
}
@@ -136,15 +113,10 @@ public class DungeonHandler {
boolean hasSecrets = false;
String[] parts = statusBar.split(" {4,}");
for (String part : parts) {
- if (
- part.toLowerCase().contains("secrets") &&
- !statusBar.toLowerCase().contains("no secrets")
- ) {
+ if (part.toLowerCase().contains("secrets") && !statusBar.toLowerCase().contains("no secrets")) {
hasSecrets = true;
try {
- String secret = Utils
- .removeColor(part.replace("Secrets", ""))
- .replace(" ", "");
+ String secret = Utils.removeColor(part.replace("Secrets", "")).replace(" ", "");
maxSecrets = Integer.parseInt(secret.split("/")[1]);
secrets = Integer.parseInt(secret.split("/")[0]);
} catch (NumberFormatException ignored) {}
@@ -159,9 +131,7 @@ public class DungeonHandler {
public static void parseTotalSecrets(String playerName) {
if (playerName.toLowerCase().contains("secrets found:")) {
String totalSecret = Utils
- .removeColor(
- playerName.toLowerCase().replace("secrets found:", "")
- )
+ .removeColor(playerName.toLowerCase().replace("secrets found:", ""))
.replace(" ", "");
try {
totalSecrets = Integer.parseInt(totalSecret);
@@ -184,9 +154,7 @@ public class DungeonHandler {
public static void parseCrypts(String playerName) {
if (playerName.toLowerCase().contains("crypts:")) {
- String crypt = Utils
- .removeColor(playerName.toLowerCase().replace("crypts:", ""))
- .replace(" ", "");
+ String crypt = Utils.removeColor(playerName.toLowerCase().replace("crypts:", "")).replace(" ", "");
try {
crypts = Integer.parseInt(crypt);
} catch (NumberFormatException ignored) {}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java
index f517655..b0816fb 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java
@@ -7,12 +7,7 @@ public class DungeonPlayer {
private final int health;
private final boolean dead;
- public DungeonPlayer(
- Classes playersClass,
- String playersName,
- int playersHealth,
- boolean isDead
- ) {
+ public DungeonPlayer(Classes playersClass, String playersName, int playersHealth, boolean isDead) {
this.dungeonClass = playersClass;
this.name = playersName;
this.health = isDead ? 0 : playersHealth;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java
index 0338195..6f06f40 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java
@@ -16,10 +16,7 @@ public class BossbarHandler {
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onBossbarRender(RenderGameOverlayEvent.Pre event) {
- if (
- event.type == RenderGameOverlayEvent.ElementType.BOSSHEALTH &&
- BossStatus.bossName != null
- ) {
+ if (event.type == RenderGameOverlayEvent.ElementType.BOSSHEALTH && BossStatus.bossName != null) {
bossBarRendered = !event.isCanceled();
if (!SkyblockHud.config.main.bossShiftHud) {
bossBarRendered = false;
@@ -27,11 +24,8 @@ public class BossbarHandler {
String bossName = Utils.removeColor(BossStatus.bossName);
if (
SkyblockHud.config.renderer.hideBossBar &&
- DwarvenMineHandler.currentEvent ==
- DwarvenMineHandler.Event.NONE &&
- !LocationHandler
- .getCurrentLocation()
- .equals(Locations.CATACOMBS)
+ DwarvenMineHandler.currentEvent == DwarvenMineHandler.Event.NONE &&
+ !LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)
) {
if (bossName.equalsIgnoreCase("wither")) {
event.setCanceled(true);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java
index ea0ccca..847b6c7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java
@@ -35,19 +35,13 @@ public class CurrencyHandler {
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
if (
- Utils
- .removeColor(event.formattedLine.toLowerCase().trim())
- .contains("purse:") ||
- Utils
- .removeColor(event.formattedLine.toLowerCase().trim())
- .contains("piggy:")
+ Utils.removeColor(event.formattedLine.toLowerCase().trim()).contains("purse:") ||
+ Utils.removeColor(event.formattedLine.toLowerCase().trim()).contains("piggy:")
) {
CurrencyHandler.checkCoins(event.formattedLine);
}
if (
- Utils
- .removeColor(event.formattedLine.toLowerCase().trim())
- .contains("bits:") &&
+ Utils.removeColor(event.formattedLine.toLowerCase().trim()).contains("bits:") &&
!event.formattedLine.toLowerCase().contains("(")
) {
CurrencyHandler.checkBits(event.formattedLine);
@@ -56,81 +50,50 @@ public class CurrencyHandler {
@SubscribeEvent
public void onSidebarPost(SidebarPostEvent event) {
- if (
- !Arrays.toString(event.arrayScores).toLowerCase().contains("bits:")
- ) {
+ if (!Arrays.toString(event.arrayScores).toLowerCase().contains("bits:")) {
CurrencyHandler.setBits(0);
}
}
public static String getCoinsFormatted() {
- DecimalFormat formatter = new DecimalFormat(
- "#,###.0",
- DecimalFormatSymbols.getInstance(Locale.CANADA)
- );
+ DecimalFormat formatter = new DecimalFormat("#,###.0", DecimalFormatSymbols.getInstance(Locale.CANADA));
String output = formatter.format(coins);
- if (output.equals(".0")) output = "0.0"; else if (
- output.equals(",0")
- ) output = "0,0";
+ if (output.equals(".0")) output = "0.0"; else if (output.equals(",0")) output = "0,0";
return output;
}
public static String getBitsFormatted() {
- DecimalFormat formatter = new DecimalFormat(
- "#.#",
- DecimalFormatSymbols.getInstance(Locale.CANADA)
- );
+ DecimalFormat formatter = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.CANADA));
formatter.setRoundingMode(RoundingMode.FLOOR);
- return bits > 999
- ? formatter.format((double) bits / 1000) + "k"
- : String.valueOf(bits);
+ return bits > 999 ? formatter.format((double) bits / 1000) + "k" : String.valueOf(bits);
}
public static void checkCoins(String formatedScoreboardLine) {
String purse = Utils
.removeWhiteSpaceAndRemoveWord(
Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()),
- Utils
- .removeColor(
- formatedScoreboardLine.toLowerCase().trim()
- )
- .contains("purse:")
- ? "purse:"
- : "piggy:"
+ Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()).contains("purse:") ? "purse:" : "piggy:"
)
.replace(",", "");
if (!purse.contains("(") && !purse.contains("+")) {
try {
- double coins = Double.parseDouble(
- Pattern.compile("[^0-9.]").matcher(purse).replaceAll("")
- );
+ double coins = Double.parseDouble(Pattern.compile("[^0-9.]").matcher(purse).replaceAll(""));
CurrencyHandler.setCoins(coins);
} catch (IllegalArgumentException ex) {
- System.out.println(
- "Failed to parse purse, please report to ThatGravyBoat. Purse Text: " +
- purse
- );
+ System.out.println("Failed to parse purse, please report to ThatGravyBoat. Purse Text: " + purse);
}
}
}
public static void checkBits(String formatedScoreboardLine) {
String bits = Utils
- .removeWhiteSpaceAndRemoveWord(
- Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()),
- "bits:"
- )
+ .removeWhiteSpaceAndRemoveWord(Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()), "bits:")
.replace(",", "");
try {
- int bit = Integer.parseInt(
- Pattern.compile("[^0-9]").matcher(bits).replaceAll("")
- );
+ int bit = Integer.parseInt(Pattern.compile("[^0-9]").matcher(bits).replaceAll(""));
CurrencyHandler.setBits(bit);
} catch (IllegalArgumentException ex) {
- System.out.println(
- "Failed to parse bits, please report to ThatGravyBoat. Bits Text: " +
- bits
- );
+ System.out.println("Failed to parse bits, please report to ThatGravyBoat. Bits Text: " + bits);
}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java
index e7686d2..fa0d21c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java
@@ -13,21 +13,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class HeldItemHandler extends Gui {
public void drawFuelBar(Minecraft mc, int current, int max) {
- GenericOverlays.drawSmallBar(
- mc,
- 100,
- 100,
- (double) current / (double) max,
- 1.0d,
- 0xff00ff,
- 0xffff00,
- 0
- );
+ GenericOverlays.drawSmallBar(mc, 100, 100, (double) current / (double) max, 1.0d, 0xff00ff, 0xffff00, 0);
drawString(
mc.fontRendererObj,
- "Fuel - " +
- Math.round(((double) current / (double) max) * 100) +
- "%",
+ "Fuel - " + Math.round(((double) current / (double) max) * 100) + "%",
100,
100,
0xffffff
@@ -37,16 +26,11 @@ public class HeldItemHandler extends Gui {
public boolean isDrill(ItemStack stack) {
if (stack == null) return false;
if (!stack.getTagCompound().hasKey("ExtraAttributes")) return false;
- return stack
- .getTagCompound()
- .getCompoundTag("ExtraAttributes")
- .hasKey("drill_fuel");
+ return stack.getTagCompound().getCompoundTag("ExtraAttributes").hasKey("drill_fuel");
}
public String getDrillFuel(ItemStack stack) {
- NBTTagCompound display = stack
- .getTagCompound()
- .getCompoundTag("display");
+ NBTTagCompound display = stack.getTagCompound().getCompoundTag("display");
NBTTagList lore = display.getTagList("Lore", 8);
for (int i = lore.tagCount() - 1; i >= 0; i--) {
String line = Utils.removeColor(lore.getStringTagAt(i));
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java
index ab618af..5bc90d8 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java
@@ -44,22 +44,11 @@ public class MapHandler {
public String command;
public MapIconTypes type;
- public MapIcon(
- Vector2f pos,
- ResourceLocation icon,
- String tooltip,
- MapIconTypes type
- ) {
+ public MapIcon(Vector2f pos, ResourceLocation icon, String tooltip, MapIconTypes type) {
this(pos, icon, tooltip, type, "");
}
- public MapIcon(
- Vector2f pos,
- ResourceLocation icon,
- String tooltip,
- MapIconTypes type,
- String command
- ) {
+ public MapIcon(Vector2f pos, ResourceLocation icon, String tooltip, MapIconTypes type, String command) {
this.position = pos;
this.icon = icon;
this.tooltip = tooltip;
@@ -69,32 +58,16 @@ public class MapHandler {
public boolean canRender() {
SBHConfig.Map mapConfig = SkyblockHud.config.map;
- if (
- mapConfig.showInfoIcons && type.equals(MapIconTypes.INFO)
- ) return true; else if (
+ if (mapConfig.showInfoIcons && type.equals(MapIconTypes.INFO)) return true; else if (
mapConfig.showMiscIcons && type.equals(MapIconTypes.MISC)
- ) return true; else if (
- mapConfig.showNpcIcons && type.equals(MapIconTypes.NPC)
- ) return true; else if (
+ ) return true; else if (mapConfig.showNpcIcons && type.equals(MapIconTypes.NPC)) return true; else if (
mapConfig.showQuestIcons && type.equals(MapIconTypes.QUEST)
- ) return true; else return (
- mapConfig.showShopIcons && type.equals(MapIconTypes.SHOPS)
- );
+ ) return true; else return (mapConfig.showShopIcons && type.equals(MapIconTypes.SHOPS));
}
}
public enum Maps {
- HUB(
- 0.5f,
- 494,
- 444,
- 294,
- 218,
- 294,
- 224,
- new ResourceLocation("skyblockhud", "maps/hub.png"),
- HubIcons.hubIcons
- ),
+ HUB(0.5f, 494, 444, 294, 218, 294, 224, new ResourceLocation("skyblockhud", "maps/hub.png"), HubIcons.hubIcons),
MUSHROOM(
1.0f,
318,
@@ -206,15 +179,9 @@ public class MapHandler {
) {
Minecraft mc = Minecraft.getMinecraft();
if (mc.currentScreen instanceof MapScreen) return;
- if (
- LocationHandler.getCurrentLocation().getCategory().getMap() ==
- null
- ) return;
+ if (LocationHandler.getCurrentLocation().getCategory().getMap() == null) return;
if (mc.thePlayer != null) {
- MapHandler.Maps map = LocationHandler
- .getCurrentLocation()
- .getCategory()
- .getMap();
+ MapHandler.Maps map = LocationHandler.getCurrentLocation().getCategory().getMap();
mc.renderEngine.bindTexture(mapOverlay);
GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
Position pos = SkyblockHud.config.map.miniMapPosition;
@@ -235,16 +202,8 @@ public class MapHandler {
float u = (x / (map.width / 256f)) - 33f;
float v = (z / (map.height / 256f)) - 28f;
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_WRAP_S,
- GL11.GL_CLAMP
- );
- GL11.glTexParameteri(
- GL11.GL_TEXTURE_2D,
- GL11.GL_TEXTURE_WRAP_T,
- GL11.GL_CLAMP
- );
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP);
+ GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP);
Gui.drawModalRectWithCustomSizedTexture(
pos.getAbsX(event.resolution, 72) + 4,
@@ -279,9 +238,7 @@ public class MapHandler {
256,
256
);
- String keyCode = GameSettings.getKeyDisplayString(
- KeyBindings.map.getKeyCode()
- );
+ String keyCode = GameSettings.getKeyDisplayString(KeyBindings.map.getKeyCode());
Utils.drawStringCenteredScaled(
keyCode,
mc.fontRendererObj,
@@ -292,12 +249,7 @@ public class MapHandler {
0xFFFFFF
);
BlockPos playerPos = mc.thePlayer.getPosition();
- String position = String.format(
- "%d/%d/%d",
- playerPos.getX(),
- playerPos.getY(),
- playerPos.getZ()
- );
+ String position = String.format("%d/%d/%d", playerPos.getX(), playerPos.getY(), playerPos.getZ());
Utils.drawStringCenteredScaled(
position,
mc.fontRendererObj,
@@ -316,18 +268,14 @@ public class MapHandler {
public void clientTick(TickEvent.ClientTickEvent event) {
if (
KeyBindings.map.isPressed() &&
- LocationHandler.getCurrentLocation().getCategory().getMap() !=
- null &&
+ LocationHandler.getCurrentLocation().getCategory().getMap() != null &&
SkyblockHud.hasSkyblockScoreboard()
) SkyblockHud.screenToOpen = new MapScreen();
}
public static class MapScreen extends GuiScreen {
- public MapHandler.Maps map = LocationHandler
- .getCurrentLocation()
- .getCategory()
- .getMap();
+ public MapHandler.Maps map = LocationHandler.getCurrentLocation().getCategory().getMap();
@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
@@ -347,10 +295,7 @@ public class MapHandler {
(int) (map.height * map.scaleFactor)
);
drawIcons((int) mapX, (int) mapY);
- if (
- this.mc.thePlayer != null &&
- SkyblockHud.config.map.showPlayerLocation
- ) {
+ if (this.mc.thePlayer != null && SkyblockHud.config.map.showPlayerLocation) {
int x = this.mc.thePlayer.getPosition().getX() + map.xOffset;
int z = this.mc.thePlayer.getPosition().getZ() + map.yOffset;
fontRendererObj.drawString(
@@ -371,24 +316,9 @@ public class MapHandler {
GlStateManager.enableBlend();
GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
this.mc.renderEngine.bindTexture(icon.icon);
- float x =
- ((icon.position.x + map.xOffset) * map.scaleFactor) +
- startX -
- 4;
- float y =
- ((icon.position.y + map.yOffset) * map.scaleFactor) +
- startY -
- 4;
- Gui.drawModalRectWithCustomSizedTexture(
- (int) x,
- (int) y,
- 0,
- 0,
- 8,
- 8,
- 8,
- 8
- );
+ float x = ((icon.position.x + map.xOffset) * map.scaleFactor) + startX - 4;
+ float y = ((icon.position.y + map.yOffset) * map.scaleFactor) + startY - 4;
+ Gui.drawModalRectWithCustomSizedTexture((int) x, (int) y, 0, 0, 8, 8, 8, 8);
GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
}
}
@@ -400,36 +330,16 @@ public class MapHandler {
if (
Utils.inRangeInclusive(
mouseX,
- (int) (
- (icon.position.x + map.xOffset) * map.scaleFactor
- ) +
- startX -
- 4,
- (int) (
- (icon.position.x + map.xOffset) * map.scaleFactor
- ) +
- startX +
- 4
+ (int) ((icon.position.x + map.xOffset) * map.scaleFactor) + startX - 4,
+ (int) ((icon.position.x + map.xOffset) * map.scaleFactor) + startX + 4
) &&
Utils.inRangeInclusive(
mouseY,
- (int) (
- (icon.position.y + map.yOffset) * map.scaleFactor
- ) +
- startY -
- 4,
- (int) (
- (icon.position.y + map.yOffset) * map.scaleFactor
- ) +
- startY +
- 4
+ (int) ((icon.position.y + map.yOffset) * map.scaleFactor) + startY - 4,
+ (int) ((icon.position.y + map.yOffset) * map.scaleFactor) + startY + 4
)
) {
- drawHoveringText(
- Arrays.asList(icon.tooltip.split("\n")),
- mouseX,
- mouseY
- );
+ drawHoveringText(Arrays.asList(icon.tooltip.split("\n")), mouseX, mouseY);
break;
}
}
@@ -437,40 +347,20 @@ public class MapHandler {
@Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
- int mapX = (int) (
- (width / 2f) - ((map.width / 2f) * map.scaleFactor)
- );
- int mapY = (int) (
- (height / 2f) - ((map.height / 2f) * map.scaleFactor)
- );
+ int mapX = (int) ((width / 2f) - ((map.width / 2f) * map.scaleFactor));
+ int mapY = (int) ((height / 2f) - ((map.height / 2f) * map.scaleFactor));
for (MapIcon icon : map.icons) {
if (!icon.canRender()) continue;
if (
Utils.inRangeInclusive(
mouseX,
- (int) (
- (icon.position.x + map.xOffset) * map.scaleFactor
- ) +
- mapX -
- 4,
- (int) (
- (icon.position.x + map.xOffset) * map.scaleFactor
- ) +
- mapX +
- 4
+ (int) ((icon.position.x + map.xOffset) * map.scaleFactor) + mapX - 4,
+ (int) ((icon.position.x + map.xOffset) * map.scaleFactor) + mapX + 4
) &&
Utils.inRangeInclusive(
mouseY,
- (int) (
- (icon.position.y + map.yOffset) * map.scaleFactor
- ) +
- mapY -
- 4,
- (int) (
- (icon.position.y + map.yOffset) * map.scaleFactor
- ) +
- mapY +
- 4
+ (int) ((icon.position.y + map.yOffset) * map.scaleFactor) + mapY - 4,
+ (int) ((icon.position.y + map.yOffset) * map.scaleFactor) + mapY + 4
)
) {
if (!icon.command.isEmpty()) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
index 6b2c808..627be26 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
@@ -12,12 +12,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class SlayerHandler {
//Optional Characters are required because Hypixel dumb and cuts off text
- private static final Pattern COMBAT_XP_REGEX = Pattern.compile(
- "\\(([\\d,]+)/([\\dkm]+)\\) comb?a?t? x?p?"
- );
- private static final Pattern KILLS_REGEX = Pattern.compile(
- "(\\d+)/(\\d+) kills?"
- );
+ private static final Pattern COMBAT_XP_REGEX = Pattern.compile("\\(([\\d,]+)/([\\dkm]+)\\) comb?a?t? x?p?");
+ private static final Pattern KILLS_REGEX = Pattern.compile("(\\d+)/(\\d+) kills?");
public enum slayerTypes {
ZOMBIE(34, "Revenant Horror"),
@@ -63,32 +59,23 @@ public class SlayerHandler {
@SubscribeEvent
public void onSidebarPost(SidebarPostEvent event) {
String arrayString = Arrays.toString(event.arrayScores);
- isDoingSlayer =
- Arrays.toString(event.arrayScores).contains("Slayer Quest");
+ isDoingSlayer = Arrays.toString(event.arrayScores).contains("Slayer Quest");
if (
isDoingSlayer &&
(
currentSlayer.equals(slayerTypes.NONE) ||
!arrayString
.replace(" ", "")
- .contains(
- currentSlayer.getDisplayName().replace(" ", "") +
- Utils.intToRomanNumeral(slayerTier)
- )
+ .contains(currentSlayer.getDisplayName().replace(" ", "") + Utils.intToRomanNumeral(slayerTier))
)
) {
for (int i = 0; i < event.scores.size(); i++) {
String line = event.scores.get(i);
if (line.contains("Slayer Quest") && event.scores.size() > 3) {
String slayer = event.scores.get(i - 1).toLowerCase();
- SlayerHandler.slayerTypes selectedSlayer =
- SlayerHandler.slayerTypes.NONE;
+ SlayerHandler.slayerTypes selectedSlayer = SlayerHandler.slayerTypes.NONE;
for (slayerTypes types : slayerTypes.values()) {
- if (
- slayer.contains(
- types.displayName.toLowerCase(Locale.ENGLISH)
- )
- ) {
+ if (slayer.contains(types.displayName.toLowerCase(Locale.ENGLISH))) {
selectedSlayer = types;
break;
}
@@ -96,14 +83,7 @@ public class SlayerHandler {
SlayerHandler.currentSlayer = selectedSlayer;
SlayerHandler.slayerTier =
Utils.whatRomanNumeral(
- slayer
- .replace(
- selectedSlayer
- .getDisplayName()
- .toLowerCase(),
- ""
- )
- .replace(" ", "")
+ slayer.replace(selectedSlayer.getDisplayName().toLowerCase(), "").replace(" ", "")
);
break;
}
@@ -117,9 +97,7 @@ public class SlayerHandler {
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
- if (
- !isDoingSlayer && event.formattedLine.equals("Slayer Quest")
- ) isDoingSlayer = true;
+ if (!isDoingSlayer && event.formattedLine.equals("Slayer Quest")) isDoingSlayer = true;
if (isDoingSlayer) {
String line = event.formattedLine.toLowerCase();
@@ -144,11 +122,7 @@ public class SlayerHandler {
try {
maxKills =
Integer.parseInt(xpMatcher.group(2).replace("k", "")) *
- (
- xpMatcher.group(2).contains("k")
- ? 1000
- : xpMatcher.group(2).contains("m") ? 1000000 : 1
- );
+ (xpMatcher.group(2).contains("k") ? 1000 : xpMatcher.group(2).contains("m") ? 1000000 : 1);
} catch (Exception ignored) {}
} else if (line.contains("slay the boss")) {
SlayerHandler.bossSlain = false;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java
index 1fc3d3f..91b3835 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java
@@ -14,34 +14,17 @@ public class TimeHandler {
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
- if (
- Pattern.matches(
- "([0-9]*):([0-9]*)(pm|am)",
- event.formattedLine.toLowerCase().trim()
- )
- ) {
- boolean isPm = event.formattedLine
- .toLowerCase()
- .trim()
- .endsWith("pm");
- SimpleDateFormat parseFormat = new SimpleDateFormat(
- "hh:mm a",
- Locale.CANADA
- );
+ if (Pattern.matches("([0-9]*):([0-9]*)(pm|am)", event.formattedLine.toLowerCase().trim())) {
+ boolean isPm = event.formattedLine.toLowerCase().trim().endsWith("pm");
+ SimpleDateFormat parseFormat = new SimpleDateFormat("hh:mm a", Locale.CANADA);
String currentTimeString = event.formattedLine
.replace(" ", "")
.replace(isPm ? "pm" : "am", isPm ? " pm" : " am");
try {
time =
- (
- parseFormat.parse(currentTimeString).getTime() -
- parseFormat.parse("00:00 am").getTime()
- ) /
- 1000L;
+ (parseFormat.parse(currentTimeString).getTime() - parseFormat.parse("00:00 am").getTime()) / 1000L;
} catch (ParseException ignored) {
- LogManager
- .getLogger()
- .warn("timeformat error: " + currentTimeString);
+ LogManager.getLogger().warn("timeformat error: " + currentTimeString);
}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java
index abfbd0e..3ef4179 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java
@@ -27,9 +27,7 @@ public class DwarvenIcons {
new ComponentBuilder()
.nl("Puzzler", new char[] { 'a', 'l' })
.nl("Description", 'l')
- .nl(
- "The Puzzler gives you a small puzzle each day to solve and"
- )
+ .nl("The Puzzler gives you a small puzzle each day to solve and")
.nl("gives you 1000 mithril powder.")
.build(),
MapHandler.MapIconTypes.NPC
@@ -47,12 +45,8 @@ public class DwarvenIcons {
new ComponentBuilder()
.nl("King", new char[] { 'a', 'l' })
.nl("Description", 'l')
- .nl(
- "The King allows you to first start commissions and if you click"
- )
- .nl(
- "each king which change every skyblock day you will get"
- )
+ .nl("The King allows you to first start commissions and if you click")
+ .nl("each king which change every skyblock day you will get")
.nl("the King Talisman.")
.nl()
.apd("Click to open HOTM", new char[] { '6', 'l' })
@@ -67,10 +61,7 @@ public class DwarvenIcons {
dwarvenIcons.add(
new MapHandler.MapIcon(
new Vector2f(4, 8),
- new ResourceLocation(
- "skyblockhud",
- "maps/icons/blacksmith.png"
- ),
+ new ResourceLocation("skyblockhud", "maps/icons/blacksmith.png"),
new ComponentBuilder()
.nl("Forge", new char[] { 'a', 'l' })
.nl("Description", 'l')
@@ -78,9 +69,7 @@ public class DwarvenIcons {
.nl("and fuel your drill.")
.nl("NPCS", new char[] { 'c', 'l' })
.nl(" Forger - Allows you to forge special items")
- .nl(
- " Jotraeline Greatforge - Allows you to refuel your drill."
- )
+ .nl(" Jotraeline Greatforge - Allows you to refuel your drill.")
.nl()
.apd("Click to warp", new char[] { '6', 'l' })
.build(),
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java
index 2eafaec..4539f35 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java
@@ -78,9 +78,7 @@ public class HubIcons {
.nl(" Bartender")
.nl(" Maddox the slayer")
.nl("Description", 'l')
- .nl(
- "The Tavern is where maddox the slayer is located you can"
- )
+ .nl("The Tavern is where maddox the slayer is located you can")
.nl("start slayer quests with them to unlock")
.apd("new items the more slayer bosses you kill.")
.build(),
@@ -110,10 +108,7 @@ public class HubIcons {
hubIcons.add(
new MapHandler.MapIcon(
new Vector2f(58, -73),
- new ResourceLocation(
- "skyblockhud",
- "maps/icons/fishing_merchant.png"
- ),
+ new ResourceLocation("skyblockhud", "maps/icons/fishing_merchant.png"),
new ComponentBuilder()
.nl("Fishing Merchant", new char[] { 'a', 'l' })
.nl("Description", 'l')
@@ -141,10 +136,7 @@ public class HubIcons {
hubIcons.add(
new MapHandler.MapIcon(
new Vector2f(-4, -128),
- new ResourceLocation(
- "skyblockhud",
- "maps/icons/metal_merchants.png"
- ),
+ new ResourceLocation("skyblockhud", "maps/icons/metal_merchants.png"),
new ComponentBuilder()
.nl("Blacksmith Merchants", new char[] { 'a', 'l' })
.nl("Merchants", new char[] { 'c', 'l' })
@@ -158,10 +150,7 @@ public class HubIcons {
hubIcons.add(
new MapHandler.MapIcon(
new Vector2f(-30, -120),
- new ResourceLocation(
- "skyblockhud",
- "maps/icons/blacksmith.png"
- ),
+ new ResourceLocation("skyblockhud", "maps/icons/blacksmith.png"),
new ComponentBuilder()
.nl("Blacksmith", new char[] { 'a', 'l' })
.nl("NPCS", new char[] { 'c', 'l' })
@@ -170,9 +159,7 @@ public class HubIcons {
.nl(" Smithmonger")
.nl("Description", 'l')
.nl("The Blacksmith lets you reforge your items")
- .nl(
- "while the Smithmonger allows you to buy reforge stones"
- )
+ .nl("while the Smithmonger allows you to buy reforge stones")
.apd("and Dusk allows you to combine and apply runes.")
.build(),
MapHandler.MapIconTypes.SHOPS
@@ -253,9 +240,7 @@ public class HubIcons {
new ComponentBuilder()
.nl("Bank", new char[] { 'a', 'l' })
.nl("Description", 'l')
- .nl(
- "The Bank is where you can store your money on skyblock"
- )
+ .nl("The Bank is where you can store your money on skyblock")
.apd("you can also store some items in the vault.")
.build(),
MapHandler.MapIconTypes.MISC
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java
index f5e7c2f..eda0b6f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java
@@ -17,17 +17,9 @@ public class EntityTypeHelper {
.getBaseValue();
if (
maxHealthBase == 13000d ||
- (
- maxHealthBase == 2000d &&
- enderman
- .getHeldBlockState()
- .getBlock()
- .equals(Blocks.end_portal_frame)
- )
+ (maxHealthBase == 2000d && enderman.getHeldBlockState().getBlock().equals(Blocks.end_portal_frame))
) {
- return LocationHandler
- .getCurrentLocation()
- .equals(Locations.DRAGONSNEST);
+ return LocationHandler.getCurrentLocation().equals(Locations.DRAGONSNEST);
}
}
return false;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java
index a2b70ef..83c6a70 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java
@@ -12,19 +12,14 @@ public class EntityTypeRegistry {
private static final Map<Class<? extends Entity>, List<SkyBlockEntity>> entities = Maps.newHashMap();
static {
- entities.put(
- EntityEnderman.class,
- ImmutableList.of(
- SkyBlockEntity.of("zealot", EntityTypeHelper::isZealot)
- )
- );
+ entities.put(EntityEnderman.class, ImmutableList.of(SkyBlockEntity.of("zealot", EntityTypeHelper::isZealot)));
}
public static String getEntityId(Entity entity) {
if (!entities.containsKey(entity.getClass())) return null;
- for (SkyBlockEntity skyBlockEntity : entities.get(
- entity.getClass()
- )) if (skyBlockEntity.isEntity(entity)) return skyBlockEntity.getName();
+ for (SkyBlockEntity skyBlockEntity : entities.get(entity.getClass())) if (
+ skyBlockEntity.isEntity(entity)
+ ) return skyBlockEntity.getName();
return null;
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java
index c047767..7df5667 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java
@@ -37,18 +37,13 @@ public class DwarvenMineHandler {
public static String getMithrilFormatted() {
String output = formatter.format(mithril);
- if (output.equals(".0")) output = "0.0"; else if (
- output.equals(",0")
- ) output = "0,0";
+ if (output.equals(".0")) output = "0.0"; else if (output.equals(",0")) output = "0,0";
return output;
}
public static void parseMithril(String line) {
try {
- mithril =
- Integer.parseInt(
- line.toLowerCase().replace("mithril powder:", "").trim()
- );
+ mithril = Integer.parseInt(line.toLowerCase().replace("mithril powder:", "").trim());
} catch (Exception ignored) {}
}
@@ -56,21 +51,13 @@ public class DwarvenMineHandler {
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
if (event.formattedLine.toLowerCase().contains("mithril")) {
try {
- mithril =
- Integer.parseInt(
- event.formattedLine
- .toLowerCase()
- .replace("mithril:", "")
- .trim()
- );
+ mithril = Integer.parseInt(event.formattedLine.toLowerCase().replace("mithril:", "").trim());
} catch (Exception ignored) {}
}
if (event.formattedLine.toLowerCase().contains("event")) {
if (event.formattedLine.toLowerCase().contains("raffle")) {
DwarvenMineHandler.currentEvent = Event.TICKET;
- } else if (
- event.formattedLine.toLowerCase().contains("goblin raid")
- ) {
+ } else if (event.formattedLine.toLowerCase().contains("goblin raid")) {
DwarvenMineHandler.currentEvent = Event.GOBLIN;
}
}
@@ -83,23 +70,14 @@ public class DwarvenMineHandler {
try {
eventMax =
Integer.parseInt(
- event.formattedLine
- .toLowerCase()
- .replace("pool:", "")
- .trim()
- .split("/")[0].trim()
+ event.formattedLine.toLowerCase().replace("pool:", "").trim().split("/")[0].trim()
);
} catch (Exception ignored) {}
- } else if (
- event.formattedLine.toLowerCase().contains("tickets:")
- ) {
+ } else if (event.formattedLine.toLowerCase().contains("tickets:")) {
try {
eventProgress =
Integer.parseInt(
- event.formattedLine
- .toLowerCase()
- .replace("tickets:", "")
- .split("\\(")[0].trim()
+ event.formattedLine.toLowerCase().replace("tickets:", "").split("\\(")[0].trim()
);
} catch (Exception ignored) {}
}
@@ -121,12 +99,7 @@ public class DwarvenMineHandler {
) {
try {
eventProgress =
- Integer.parseInt(
- event.formattedLine
- .toLowerCase()
- .replace("your kills:", "")
- .trim()
- );
+ Integer.parseInt(event.formattedLine.toLowerCase().replace("your kills:", "").trim());
} catch (Exception ignored) {}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java
index 51ea9d8..c989cb4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java
@@ -32,11 +32,7 @@ public class EndIslandHandler {
if (input.contains(" ")) {
try {
return dragonTypes.valueOf(
- input
- .toLowerCase()
- .replace("dragon", "")
- .replace(" ", "")
- .toUpperCase()
+ input.toLowerCase().replace("dragon", "").replace(" ", "").toUpperCase()
);
} catch (IllegalArgumentException ignored) {
return NODRAGON;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java
index 8997fa4..a4abaae 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java
@@ -11,19 +11,12 @@ public class FarmingIslandHandler {
@SubscribeEvent
public void onSidebarPost(SidebarPostEvent event) {
- boolean isTracking = Arrays
- .toString(event.arrayScores)
- .toLowerCase()
- .contains("tracker mob location:");
+ boolean isTracking = Arrays.toString(event.arrayScores).toLowerCase().contains("tracker mob location:");
if (isTracking && location == Locations.NONE) {
for (int i = 0; i < event.scores.size(); i++) {
String line = event.scores.get(i);
- if (
- line.toLowerCase().contains("tracker mob location:") &&
- i > 2
- ) {
- location =
- Locations.get(event.scores.get(i - 1).toLowerCase());
+ if (line.toLowerCase().contains("tracker mob location:") && i > 2) {
+ location = Locations.get(event.scores.get(i - 1).toLowerCase());
break;
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java
index a50358d..d16a3ac 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java
@@ -30,14 +30,9 @@ public class IslandHandler {
public static boolean checkFlightDuration(String formatedScoreboardLine) {
if (
LocationHandler.getCurrentLocation() == Locations.YOURISLAND &&
- Utils
- .removeColor(formatedScoreboardLine.toLowerCase().trim())
- .contains("flight duration:")
+ Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()).contains("flight duration:")
) {
- String timeString = formatedScoreboardLine
- .toLowerCase()
- .replace("flight duration:", "")
- .replace(" ", "");
+ String timeString = formatedScoreboardLine.toLowerCase().replace("flight duration:", "").replace(" ", "");
String[] times = timeString.split(":");
if (times.length == 2) {
int s = 0;
@@ -68,18 +63,11 @@ public class IslandHandler {
public static boolean checkRestone(String formatedScoreboardLine) {
if (LocationHandler.getCurrentLocation() == Locations.YOURISLAND) {
- if (
- formatedScoreboardLine.toLowerCase().contains("redstone:")
- ) return true;
+ if (formatedScoreboardLine.toLowerCase().contains("redstone:")) return true;
try {
redstone =
formatedScoreboardLine.toLowerCase().contains("redstone:")
- ? Integer.parseInt(
- Utils.removeWhiteSpaceAndRemoveWord(
- formatedScoreboardLine,
- "redstone:"
- )
- )
+ ? Integer.parseInt(Utils.removeWhiteSpaceAndRemoveWord(formatedScoreboardLine, "redstone:"))
: 0;
} catch (Exception ignored) {}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java
index 5cd006a..bf55db6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java
@@ -14,9 +14,7 @@ public class LocationHandler {
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
if (event.rawLine.contains("\u23E3")) {
- String objectiveName = event.objective
- .getDisplayName()
- .replaceAll("(?i)\\u00A7.", "");
+ String objectiveName = event.objective.getDisplayName().replaceAll("(?i)\\u00A7.", "");
if (objectiveName.toLowerCase(Locale.ENGLISH).endsWith("guest")) {
LocationHandler.setCurrentLocation(Locations.GUESTISLAND);
} else {
@@ -38,10 +36,7 @@ public class LocationHandler {
}
public static void handleLocation(String locationLine) {
- String location = locationLine
- .replace(" ", "")
- .toUpperCase(Locale.ENGLISH)
- .trim();
+ String location = locationLine.replace(" ", "").toUpperCase(Locale.ENGLISH).trim();
if (location.startsWith("THECATACOMBS")) {
currentLocation = Locations.CATACOMBS;
} else setCurrentLocation(location.replaceAll("[^A-Za-z0-9]", ""));
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
index 7669456..74e7ae1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
@@ -7,11 +7,7 @@ public enum Locations {
//ISLAND
YOURISLAND("yourisland", "Your Island", LocationCategory.ISLAND),
GUESTISLAND("guestisland", "Guest Island", LocationCategory.ISLAND),
- MOULBERRYSISLAND(
- "moulberryisland",
- "Cool Dude Hub",
- LocationCategory.ISLAND
- ),
+ MOULBERRYSISLAND("moulberryisland", "Cool Dude Hub", LocationCategory.ISLAND),
//HUB
VILLAGE("village", "Village", LocationCategory.HUB),
AUCTIONHOUSE("auctionhouse", "Auction House", LocationCategory.HUB),
@@ -33,11 +29,7 @@ public enum Locations {
COALMINE("coalmine", "Coal Mine", LocationCategory.HUB),
FARM("farm", "Farm", LocationCategory.HUB),
LIBRARY("library", "Library", LocationCategory.HUB),
- COMMUNITYCENTER(
- "communitycenter",
- "Community Center",
- LocationCategory.HUB
- ),
+ COMMUNITYCENTER("communitycenter", "Community Center", LocationCategory.HUB),
ELECTIONROOM("electionroom", "Election Room", LocationCategory.HUB),
BUILDERSHOUSE("buildershouse", "Builder's House", LocationCategory.HUB),
BLACKSMITH("blacksmith", "Blacksmith", LocationCategory.HUB),
@@ -47,66 +39,26 @@ public enum Locations {
THEBARN("thebarn", "The Barn", LocationCategory.BARN),
WINDMILL("windmill", "Windmill", LocationCategory.BARN),
//MUSHROOM DESERT
- MUSHROOMDESERT(
- "mushroomdesert",
- "Mushroom Desert",
- LocationCategory.MUSHROOMDESERT
- ),
- DESERTSETTLEMENT(
- "desertsettlement",
- "Desert Settlement",
- LocationCategory.MUSHROOMDESERT
- ),
+ MUSHROOMDESERT("mushroomdesert", "Mushroom Desert", LocationCategory.MUSHROOMDESERT),
+ DESERTSETTLEMENT("desertsettlement", "Desert Settlement", LocationCategory.MUSHROOMDESERT),
OASIS("oasis", "Oasis", LocationCategory.MUSHROOMDESERT),
- MUSHROOMGORGE(
- "mushroomgorge",
- "Mushroom Gorge",
- LocationCategory.MUSHROOMDESERT
- ),
- SHEPHERDSKEEP(
- "shepherdskeep",
- "Shepherds Keep",
- LocationCategory.MUSHROOMDESERT
- ),
+ MUSHROOMGORGE("mushroomgorge", "Mushroom Gorge", LocationCategory.MUSHROOMDESERT),
+ SHEPHERDSKEEP("shepherdskeep", "Shepherds Keep", LocationCategory.MUSHROOMDESERT),
JAKESHOUSE("jakeshouse", "Jake's House", LocationCategory.MUSHROOMDESERT),
- TREASUREHUNTERCAMP(
- "treasurehuntercamp",
- "Treasure Hunter Camp",
- LocationCategory.MUSHROOMDESERT
- ),
- GLOWINGMUSHROOMCAVE(
- "glowingmushroomcave",
- "Glowing Mushroom Cave",
- LocationCategory.MUSHROOMDESERT
- ),
+ TREASUREHUNTERCAMP("treasurehuntercamp", "Treasure Hunter Camp", LocationCategory.MUSHROOMDESERT),
+ GLOWINGMUSHROOMCAVE("glowingmushroomcave", "Glowing Mushroom Cave", LocationCategory.MUSHROOMDESERT),
TRAPPERSDEN("trappersden", "Trappers Den", LocationCategory.MUSHROOMDESERT),
- OVERGROWNMUSHROOMCAVE(
- "overgrownmushroomcave",
- "Overgrown Mushroom Cave",
- LocationCategory.MUSHROOMDESERT
- ),
+ OVERGROWNMUSHROOMCAVE("overgrownmushroomcave", "Overgrown Mushroom Cave", LocationCategory.MUSHROOMDESERT),
//GOLD MINE
GOLDMINE("goldmine", "Gold Mine", LocationCategory.GOLDMINE),
//DEEP CAVERNS
DEEPCAVERNS("deepcaverns", "Deep Caverns", LocationCategory.DEEPCAVERNS),
- GUNPOWDERMINES(
- "gunpowdermines",
- "Gunpowder Mines",
- LocationCategory.DEEPCAVERNS
- ),
+ GUNPOWDERMINES("gunpowdermines", "Gunpowder Mines", LocationCategory.DEEPCAVERNS),
LAPISQUARRY("lapisquarry", "Lapis Quarry", LocationCategory.DEEPCAVERNS),
PIGMANSDEN("pigmansden", "Pigman's Den", LocationCategory.DEEPCAVERNS),
SLIMEHILL("slimehill", "Slimehill", LocationCategory.DEEPCAVERNS),
- DIAMONDRESERVE(
- "diamondreserve",
- "Diamond Reserve",
- LocationCategory.DEEPCAVERNS
- ),
- OBSIDIANSANCTUARY(
- "obsidiansanctuary",
- "Obsidian Sanctuary",
- LocationCategory.DEEPCAVERNS
- ),
+ DIAMONDRESERVE("diamondreserve", "Diamond Reserve", LocationCategory.DEEPCAVERNS),
+ OBSIDIANSANCTUARY("obsidiansanctuary", "Obsidian Sanctuary", LocationCategory.DEEPCAVERNS),
//SPIDERS DEN
SPIDERSDEN("spidersden", "Spider's Den", LocationCategory.SPIDERSDEN),
@@ -119,142 +71,50 @@ public enum Locations {
BIRCHPARK("birchpark", "Birch Park", LocationCategory.PARK),
SPRUCEWOODS("sprucewoods", "Spruce Woods", LocationCategory.PARK),
DARKTHICKET("darkthicket", "Dark Thicket", LocationCategory.PARK),
- SAVANNAWOODLAND(
- "savannawoodland",
- "Savanna Woodland",
- LocationCategory.PARK
- ),
+ SAVANNAWOODLAND("savannawoodland", "Savanna Woodland", LocationCategory.PARK),
JUNGLEISLAND("jungleisland", "Jungle Island", LocationCategory.PARK),
//BLAZING FORTRESS
- BLAZINGFORTRESS(
- "blazingfortress",
- "Blazing Fortress",
- LocationCategory.FORTRESS
- ),
+ BLAZINGFORTRESS("blazingfortress", "Blazing Fortress", LocationCategory.FORTRESS),
//DUNGEONS
DUNGEONHUB("dungeonhub", "Dungeon Hub", LocationCategory.DUNGEONHUB),
CATACOMBS("catacombs", "The Catacombs", LocationCategory.DUNGEONHUB),
- CATACOMBSENTRANCE(
- "catacombsentrance",
- "Catacombs Entrance",
- LocationCategory.DUNGEONHUB
- ),
+ CATACOMBSENTRANCE("catacombsentrance", "Catacombs Entrance", LocationCategory.DUNGEONHUB),
//JERRYISLAND
- JERRYSWORKSHOP(
- "jerrysworkshop",
- "Jerry's Workshop",
- LocationCategory.JERRY
- ),
+ JERRYSWORKSHOP("jerrysworkshop", "Jerry's Workshop", LocationCategory.JERRY),
JERRYPOND("jerrypond", "Jerry Pond", LocationCategory.JERRY),
//DWARVENMINES
THELIFT("thelift", "The Lift", LocationCategory.DWARVENMINES),
- DWARVENVILLAGE(
- "dwarvenvillage",
- "Dwarven Village",
- LocationCategory.DWARVENMINES
- ),
- DWARVENMINES(
- "dwarvenmines",
- "Dwarven Mines",
- LocationCategory.DWARVENMINES
- ),
+ DWARVENVILLAGE("dwarvenvillage", "Dwarven Village", LocationCategory.DWARVENMINES),
+ DWARVENMINES("dwarvenmines", "Dwarven Mines", LocationCategory.DWARVENMINES),
LAVASPRINGS("lavasprings", "Lava Springs", LocationCategory.DWARVENMINES),
- PALACEBRIDGE(
- "palacebridge",
- "Palace Bridge",
- LocationCategory.DWARVENMINES
- ),
+ PALACEBRIDGE("palacebridge", "Palace Bridge", LocationCategory.DWARVENMINES),
ROYALPALACE("royalpalace", "Royal Palace", LocationCategory.DWARVENMINES),
- GRANDLIBRARY(
- "grandlibrary",
- "Grand Library",
- LocationCategory.DWARVENMINES
- ),
- ROYALQUARTERS(
- "royalquarters",
- "Royal Quarters",
- LocationCategory.DWARVENMINES
- ),
- BARRACKSOFHEROES(
- "barracksofheroes",
- "Barracks of Heroes",
- LocationCategory.DWARVENMINES
- ),
- HANGINGCOURT(
- "hangingcourt",
- "Hanging Court",
- LocationCategory.DWARVENMINES
- ),
- GREATICEWALL(
- "greaticewall",
- "Great Ice Wall",
- LocationCategory.DWARVENMINES
- ),
- GOBLINBURROWS(
- "goblinburrows",
- "Goblin Burrows",
- LocationCategory.DWARVENMINES
- ),
+ GRANDLIBRARY("grandlibrary", "Grand Library", LocationCategory.DWARVENMINES),
+ ROYALQUARTERS("royalquarters", "Royal Quarters", LocationCategory.DWARVENMINES),
+ BARRACKSOFHEROES("barracksofheroes", "Barracks of Heroes", LocationCategory.DWARVENMINES),
+ HANGINGCOURT("hangingcourt", "Hanging Court", LocationCategory.DWARVENMINES),
+ GREATICEWALL("greaticewall", "Great Ice Wall", LocationCategory.DWARVENMINES),
+ GOBLINBURROWS("goblinburrows", "Goblin Burrows", LocationCategory.DWARVENMINES),
FARRESERVE("farreserve", "Far Reserve", LocationCategory.DWARVENMINES),
- CCMINECARTSCO(
- "ccminecartco",
- "Minecart Co.",
- LocationCategory.DWARVENMINES
- ),
+ CCMINECARTSCO("ccminecartco", "Minecart Co.", LocationCategory.DWARVENMINES),
UPPERMINES("uppermines", "Upper Mines", LocationCategory.DWARVENMINES),
- RAMPARTSQUARRY(
- "rampartsquarry",
- "Ramparts Quarry",
- LocationCategory.DWARVENMINES
- ),
- GATESTOTHEMINES(
- "gatestothemines",
- "Gates to The Mines",
- LocationCategory.DWARVENMINES
- ),
+ RAMPARTSQUARRY("rampartsquarry", "Ramparts Quarry", LocationCategory.DWARVENMINES),
+ GATESTOTHEMINES("gatestothemines", "Gates to The Mines", LocationCategory.DWARVENMINES),
FORGEBASIN("forgebasin", "Forge Basin", LocationCategory.DWARVENMINES),
THEFORGE("theforge", "The Forge", LocationCategory.DWARVENMINES),
- CLIFFSIDEVEINS(
- "cliffsideveins",
- "Cliffside Veins",
- LocationCategory.DWARVENMINES
- ),
- DIVANSGATEWAY(
- "divansgateway",
- "Divan's Gateway",
- LocationCategory.DWARVENMINES
- ),
+ CLIFFSIDEVEINS("cliffsideveins", "Cliffside Veins", LocationCategory.DWARVENMINES),
+ DIVANSGATEWAY("divansgateway", "Divan's Gateway", LocationCategory.DWARVENMINES),
THEMIST("themist", "The Mist", LocationCategory.DWARVENMINES),
ROYALMINES("royalmines", "Royal Mines", LocationCategory.DWARVENMINES),
- ARISTOCRATPASSAGE(
- "aristocratpassage",
- "Aristocrat Passage",
- LocationCategory.DWARVENMINES
- ),
+ ARISTOCRATPASSAGE("aristocratpassage", "Aristocrat Passage", LocationCategory.DWARVENMINES),
MINERSGUILD("minersguild", "Miner's Guild", LocationCategory.DWARVENMINES),
//CRYSTALHOLLOWS
JUNGLE("jungle", "Jungle", LocationCategory.CRYSTALHOLLOWS),
MAMGAFIELDS("magmafields", "Magma Fields", LocationCategory.CRYSTALHOLLOWS),
- GOBLINHOLDOUT(
- "goblinholdout",
- "Goblin Holdout",
- LocationCategory.CRYSTALHOLLOWS
- ),
- CRYSTALNUCLEUS(
- "crystalnucleus",
- "Crystal Nucleus",
- LocationCategory.CRYSTALHOLLOWS
- ),
- PERCURSORREMNANTS(
- "precursorremnants",
- "Precursor Remnants",
- LocationCategory.CRYSTALHOLLOWS
- ),
- MITHRILDEPOSITS(
- "mithrildeposits",
- "Mithril Deposits",
- LocationCategory.CRYSTALHOLLOWS
- );
+ GOBLINHOLDOUT("goblinholdout", "Goblin Holdout", LocationCategory.CRYSTALHOLLOWS),
+ CRYSTALNUCLEUS("crystalnucleus", "Crystal Nucleus", LocationCategory.CRYSTALHOLLOWS),
+ PERCURSORREMNANTS("precursorremnants", "Precursor Remnants", LocationCategory.CRYSTALHOLLOWS),
+ MITHRILDEPOSITS("mithrildeposits", "Mithril Deposits", LocationCategory.CRYSTALHOLLOWS);
private final String name;
private final String displayName;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java
index 5d5f756..b9628d0 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java
@@ -12,10 +12,8 @@ public class ParkIslandHandler {
isRaining = false;
rainTime = "";
} else if (tabLine.toLowerCase().contains("rain:")) {
- if (tabLine.toLowerCase().contains("no rain")) isRaining =
- false; else {
- rainTime =
- tabLine.toLowerCase().replace("rain:", "").replace(" ", "");
+ if (tabLine.toLowerCase().contains("no rain")) isRaining = false; else {
+ rainTime = tabLine.toLowerCase().replace("rain:", "").replace(" ", "");
isRaining = true;
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java
index d29b6f5..330b915 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java
@@ -14,10 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(RenderEnderman.class)
public class MixinEndermanRenderer {
- @Inject(
- method = "doRender(Lnet/minecraft/entity/monster/EntityEnderman;DDDFF)V",
- at = @At("HEAD")
- )
+ @Inject(method = "doRender(Lnet/minecraft/entity/monster/EntityEnderman;DDDFF)V", at = @At("HEAD"))
public void onRender(
EntityEnderman entity,
double x,
@@ -28,15 +25,8 @@ public class MixinEndermanRenderer {
CallbackInfo ci
) {
if (EntityTypeHelper.isZealot(entity)) {
- Color color = new Color(
- SpecialColour.specialToChromaRGB("255:255:0:48:255")
- );
- GlStateManager.color(
- color.getRed() / 255f,
- color.getGreen() / 255f,
- color.getBlue() / 255f,
- 255f
- );
+ Color color = new Color(SpecialColour.specialToChromaRGB("255:255:0:48:255"));
+ GlStateManager.color(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, 255f);
}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java
index 3641876..2204995 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java
@@ -23,12 +23,9 @@ public class MixinEntityArrow {
position != null &&
position.entityHit != null &&
this.shootingEntity != null &&
- this.shootingEntity.getUniqueID()
- .equals(Minecraft.getMinecraft().thePlayer.getUniqueID())
+ this.shootingEntity.getUniqueID().equals(Minecraft.getMinecraft().thePlayer.getUniqueID())
) {
- KillTrackerHandler.attackedEntities.add(
- position.entityHit.getUniqueID()
- );
+ KillTrackerHandler.attackedEntities.add(position.entityHit.getUniqueID());
}
return position;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java
index d6e0ac6..9886ba0 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java
@@ -18,119 +18,63 @@ public class MixinGuiIngameForge {
@Shadow(remap = false)
private RenderGameOverlayEvent eventParent;
- @Inject(
- method = "renderArmor",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderArmor", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderArmor(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideArmor &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideArmor && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(ARMOR)) return;
post(ARMOR);
}
}
- @Inject(
- method = "renderHealth",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderHealth", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderHealth(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideHearts &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideHearts && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(HEALTH)) return;
post(HEALTH);
}
}
- @Inject(
- method = "renderAir",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderAir", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderAir(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideAir &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideAir && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(AIR)) return;
post(AIR);
}
}
- @Inject(
- method = "renderHealthMount",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderHealthMount", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderHealthMount(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideAnimalHearts &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideAnimalHearts && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(HEALTHMOUNT)) return;
post(HEALTHMOUNT);
}
}
- @Inject(
- method = "renderExperience",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderExperience", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderExperience(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideXpBar &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideXpBar && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(EXPERIENCE)) return;
post(EXPERIENCE);
}
}
- @Inject(
- method = "renderJumpBar",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderJumpBar", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderJumpBar(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideXpBar &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideXpBar && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(JUMPBAR)) return;
post(JUMPBAR);
}
}
- @Inject(
- method = "renderFood",
- at = @At("HEAD"),
- cancellable = true,
- remap = false
- )
+ @Inject(method = "renderFood", at = @At("HEAD"), cancellable = true, remap = false)
public void onRenderFood(int width, int height, CallbackInfo ci) {
- if (
- SkyblockHud.config.renderer.hideFood &&
- SkyblockHud.hasSkyblockScoreboard()
- ) {
+ if (SkyblockHud.config.renderer.hideFood && SkyblockHud.hasSkyblockScoreboard()) {
ci.cancel();
if (pre(FOOD)) return;
post(FOOD);
@@ -138,14 +82,10 @@ public class MixinGuiIngameForge {
}
private boolean pre(RenderGameOverlayEvent.ElementType type) {
- return MinecraftForge.EVENT_BUS.post(
- new RenderGameOverlayEvent.Pre(eventParent, type)
- );
+ return MinecraftForge.EVENT_BUS.post(new RenderGameOverlayEvent.Pre(eventParent, type));
}
private void post(RenderGameOverlayEvent.ElementType type) {
- MinecraftForge.EVENT_BUS.post(
- new RenderGameOverlayEvent.Post(eventParent, type)
- );
+ MinecraftForge.EVENT_BUS.post(new RenderGameOverlayEvent.Post(eventParent, type));
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java
index 5cb4036..c97a1f9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java
@@ -55,15 +55,8 @@ public class MixinNetHandlerPlayClient {
),
cancellable = true
)
- public void handleTeams(
- S3EPacketTeams packetIn,
- CallbackInfo ci,
- Scoreboard scoreboard
- ) {
+ public void handleTeams(S3EPacketTeams packetIn, CallbackInfo ci, Scoreboard scoreboard) {
//This stops Hypixel from being stupid and spamming our logs because they dont have different ids for things.
- if (
- scoreboard.getTeam(packetIn.getName()) != null &&
- packetIn.getAction() == 0
- ) ci.cancel();
+ if (scoreboard.getTeam(packetIn.getName()) != null && packetIn.getAction() == 0) ci.cancel();
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java b/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java
index 9d8556d..b4eb8db 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java
@@ -24,40 +24,21 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class DungeonOverlay extends Gui {
- private static final FontRenderer font = Minecraft.getMinecraft()
- .fontRendererObj;
+ private static final FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
private static boolean bossBarVisible = false;
- public void drawDungeonPlayer(
- String name,
- int health,
- boolean isDead,
- Classes dungeonClass,
- int x,
- int y
- ) {
+ public void drawDungeonPlayer(String name, int health, boolean isDead, Classes dungeonClass, int x, int y) {
if (!SkyblockHud.config.dungeon.hideDeadDungeonPlayers || !isDead) {
GlStateManager.enableBlend();
Minecraft mc = Minecraft.getMinecraft();
mc.renderEngine.bindTexture(GuiTextures.dungeon);
String healthString = isDead ? "DEAD" : Integer.toString(health);
- GlStateManager.color(
- 1.0F,
- 1.0F,
- 1.0F,
- (float) SkyblockHud.config.dungeon.dungeonPlayerOpacity / 100
- );
+ GlStateManager.color(1.0F, 1.0F, 1.0F, (float) SkyblockHud.config.dungeon.dungeonPlayerOpacity / 100);
drawTexturedModalRect(x, y, 0, dungeonClass.getTextureY(), 120, 32);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
drawString(font, name, x + 50, y + 6, 0xFFFFFF);
- drawString(
- font,
- healthString,
- x + 50,
- y + font.FONT_HEIGHT + 9,
- 0xFF2B2B
- );
+ drawString(font, healthString, x + 50, y + font.FONT_HEIGHT + 9, 0xFF2B2B);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
}
}
@@ -69,50 +50,15 @@ public class DungeonOverlay extends Gui {
int dungeonTime = DungeonHandler.getDungeonTime();
int dungeonTimeMin = dungeonTime / 60;
int dungeonTimeSec = dungeonTime - dungeonTimeMin * 60;
- drawTexturedModalRect(
- (width / 2) - 17,
- offset + (bossBarVisible ? 17 : 0),
- 0,
- 0,
- 34,
- 34
- );
+ drawTexturedModalRect((width / 2) - 17, offset + (bossBarVisible ? 17 : 0), 0, 0, 34, 34);
mc.renderEngine.bindTexture(GuiTextures.dungeon);
- drawTexturedModalRect(
- (width / 2) - 7,
- offset + (bossBarVisible ? 20 : 3),
- 16,
- 50,
- 3,
- 8
- );
- drawTexturedModalRect(
- (width / 2) - 7,
- offset + (bossBarVisible ? 30 : 13),
- 19,
- 50,
- 3,
- 8
- );
+ drawTexturedModalRect((width / 2) - 7, offset + (bossBarVisible ? 20 : 3), 16, 50, 3, 8);
+ drawTexturedModalRect((width / 2) - 7, offset + (bossBarVisible ? 30 : 13), 19, 50, 3, 8);
String dungeonTimeElapsed =
- (
- dungeonTimeMin > 9
- ? String.valueOf(dungeonTimeMin)
- : "0" + dungeonTimeMin
- ) +
+ (dungeonTimeMin > 9 ? String.valueOf(dungeonTimeMin) : "0" + dungeonTimeMin) +
":" +
- (
- dungeonTimeSec > 9
- ? String.valueOf(dungeonTimeSec)
- : "0" + dungeonTimeSec
- );
- drawCenteredString(
- font,
- dungeonTimeElapsed,
- (width / 2),
- offset + (bossBarVisible ? 40 : 23),
- 0xFFFF55
- );
+ (dungeonTimeSec > 9 ? String.valueOf(dungeonTimeSec) : "0" + dungeonTimeSec);
+ drawCenteredString(font, dungeonTimeElapsed, (width / 2), offset + (bossBarVisible ? 40 : 23), 0xFFFF55);
//KEYS
drawString(
font,
@@ -134,11 +80,7 @@ public class DungeonOverlay extends Gui {
int clearPercent = DungeonHandler.getDungeonCleared();
String clearPercentage =
"Dungeon Cleared: \u00A7" +
- (
- clearPercent <= 20
- ? "4"
- : clearPercent <= 50 ? "6" : clearPercent <= 80 ? "e" : "a"
- ) +
+ (clearPercent <= 20 ? "4" : clearPercent <= 50 ? "6" : clearPercent <= 80 ? "e" : "a") +
clearPercent +
"%";
drawTexturedModalRect(
@@ -157,13 +99,7 @@ public class DungeonOverlay extends Gui {
4,
14
);
- drawString(
- font,
- clearPercentage,
- (width / 2) + 18,
- offset + (bossBarVisible ? 23 : 6),
- 0xAAAAAA
- );
+ drawString(font, clearPercentage, (width / 2) + 18, offset + (bossBarVisible ? 23 : 6), 0xAAAAAA);
//DEATHS
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
@@ -186,13 +122,7 @@ public class DungeonOverlay extends Gui {
4,
14
);
- drawString(
- font,
- deathText,
- (width / 2) + 18,
- offset + (bossBarVisible ? 38 : 21),
- 0xAAAAAA
- );
+ drawString(font, deathText, (width / 2) + 18, offset + (bossBarVisible ? 38 : 21), 0xAAAAAA);
//SECRETS
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
@@ -200,14 +130,7 @@ public class DungeonOverlay extends Gui {
int maxSecrets = DungeonHandler.getMaxSecrets();
int secrets = DungeonHandler.getSecrets();
int totalSecrets = DungeonHandler.getTotalSecrets();
- String secretsText =
- "Secrets: " +
- secrets +
- "/" +
- maxSecrets +
- " (" +
- totalSecrets +
- ")";
+ String secretsText = "Secrets: " + secrets + "/" + maxSecrets + " (" + totalSecrets + ")";
drawTexturedModalRect(
(width / 2) - 17 - (font.getStringWidth(secretsText)) - 4,
offset + (bossBarVisible ? 20 : 3),
@@ -295,9 +218,7 @@ public class DungeonOverlay extends Gui {
)
) {
bossBarVisible =
- BossStatus.statusBarTime > 0 &&
- GuiIngameForge.renderBossHealth &&
- BossbarHandler.bossBarRendered;
+ BossStatus.statusBarTime > 0 && GuiIngameForge.renderBossHealth && BossbarHandler.bossBarRendered;
GlStateManager.enableBlend();
drawUltimateBar(mc, event.resolution);
@@ -310,19 +231,8 @@ public class DungeonOverlay extends Gui {
SkyblockHud.config.dungeon.dungeonPlayer3,
SkyblockHud.config.dungeon.dungeonPlayer4
};
- for (
- int i = 0;
- i <
- Math.min(
- DungeonHandler.getDungeonPlayers().values().size(),
- 4
- );
- i++
- ) {
- DungeonPlayer player = (DungeonPlayer) DungeonHandler
- .getDungeonPlayers()
- .values()
- .toArray()[i];
+ for (int i = 0; i < Math.min(DungeonHandler.getDungeonPlayers().values().size(), 4); i++) {
+ DungeonPlayer player = (DungeonPlayer) DungeonHandler.getDungeonPlayers().values().toArray()[i];
int posX;
int posY;
try {
@@ -347,10 +257,7 @@ public class DungeonOverlay extends Gui {
}
drawDungeonClock(
event.resolution.getScaledWidth(),
- SkyblockHud.config.main.mainHudPos.getAbsY(
- event.resolution,
- 34
- ),
+ SkyblockHud.config.main.mainHudPos.getAbsY(event.resolution, 34),
mc
);
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java b/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java
index 45fd243..b249362 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java
@@ -22,9 +22,7 @@ public class GenericOverlays extends Gui {
) {
if (SkyblockHud.hasSkyblockScoreboard()) {
mc.renderEngine.bindTexture(GuiTextures.bars);
- Color color = new Color(
- percentage == max ? fullColor : loadingColor
- );
+ Color color = new Color(percentage == max ? fullColor : loadingColor);
RenderUtils.drawTexturedModalRect(x, y, 0, 0, 182, 5);
GlStateManager.color(
@@ -34,23 +32,9 @@ public class GenericOverlays extends Gui {
color.getAlpha() / 255f
);
RenderUtils.drawTexturedModalRect(x, y, 0, 30, 182, 5);
- RenderUtils.drawTexturedModalRect(
- x,
- y,
- 0,
- 5,
- (int) (182 * percentage),
- 5
- );
+ RenderUtils.drawTexturedModalRect(x, y, 0, 5, (int) (182 * percentage), 5);
if (barStyle != 0) {
- RenderUtils.drawTexturedModalRect(
- x,
- y,
- 0,
- 5 + (barStyle * 5),
- 182,
- 5
- );
+ RenderUtils.drawTexturedModalRect(x, y, 0, 5 + (barStyle * 5), 182, 5);
}
}
}
@@ -67,9 +51,7 @@ public class GenericOverlays extends Gui {
) {
if (SkyblockHud.hasSkyblockScoreboard()) {
mc.renderEngine.bindTexture(GuiTextures.bars);
- Color color = new Color(
- percentage == max ? fullColor : loadingColor
- );
+ Color color = new Color(percentage == max ? fullColor : loadingColor);
GlStateManager.enableBlend();
RenderUtils.drawTexturedModalRect(x, y, 0, 35, 62, 5);
GlStateManager.color(
@@ -79,23 +61,9 @@ public class GenericOverlays extends Gui {
color.getAlpha() / 255f
);
RenderUtils.drawTexturedModalRect(x, y, 0, 65, 62, 5);
- RenderUtils.drawTexturedModalRect(
- x,
- y,
- 0,
- 40,
- (int) (62 * percentage),
- 5
- );
+ RenderUtils.drawTexturedModalRect(x, y, 0, 40, (int) (62 * percentage), 5);
if (barStyle != 0) {
- RenderUtils.drawTexturedModalRect(
- x,
- y,
- 0,
- 45 + (barStyle * 5),
- 62,
- 5
- );
+ RenderUtils.drawTexturedModalRect(x, y, 0, 45 + (barStyle * 5), 62, 5);
}
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java b/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java
index cba60eb..5560ff7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java
@@ -25,8 +25,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class OverlayHud extends Gui {
- private static final FontRenderer font = Minecraft.getMinecraft()
- .fontRendererObj;
+ private static final FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
//STATS
private static boolean eventToggle;
@@ -41,8 +40,7 @@ public class OverlayHud extends Gui {
int timeMin = (int) (TimeHandler.time / 60);
int timeHour = timeMin / 60;
timeMin = timeMin - (timeHour * 60);
- String militaryTime =
- timeHour + ":" + (timeMin == 0 ? timeMin + "0" : timeMin);
+ String militaryTime = timeHour + ":" + (timeMin == 0 ? timeMin + "0" : timeMin);
int time12Hour = timeHour >= 12 ? timeHour - 12 : timeHour;
String normalTime =
(time12Hour == 0 ? "00" : String.valueOf(time12Hour)) +
@@ -50,14 +48,7 @@ public class OverlayHud extends Gui {
(timeMin == 0 ? "00" : timeMin) +
(timeHour >= 12 ? "pm" : "am");
- drawTexturedModalRect(
- (width / 2) - 17,
- offset + (bossBarVisible ? 17 : 0),
- 0,
- 0,
- 34,
- 34
- );
+ drawTexturedModalRect((width / 2) - 17, offset + (bossBarVisible ? 17 : 0), 0, 0, 34, 34);
drawTexturedModalRect(
(width / 2) - 4,
offset + (bossBarVisible ? 24 : 7),
@@ -94,43 +85,20 @@ public class OverlayHud extends Gui {
//EXTRA SLOT
if (LocationHandler.getCurrentLocation().equals(Locations.YOURISLAND)) {
- if (IslandHandler.flightTime > 0) drawFlightDuration(
- width,
- offset,
- mc
- );
- } else if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.MUSHROOMDESERT)
- ) {
+ if (IslandHandler.flightTime > 0) drawFlightDuration(width, offset, mc);
+ } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) {
drawTrapperOrPelts(width, offset, mc);
- } else if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.DWARVENMINES)
- ) {
- if (
- DwarvenMineHandler.currentEvent != DwarvenMineHandler.Event.NONE
- ) {
+ } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.DWARVENMINES)) {
+ if (DwarvenMineHandler.currentEvent != DwarvenMineHandler.Event.NONE) {
drawDwarvenEvent(width, offset, mc);
} else {
drawMithril(width, offset, mc);
}
} else if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.PARK) &&
+ LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK) &&
ParkIslandHandler.isRaining()
) {
- if (
- LocationHandler
- .getCurrentLocation()
- .equals(Locations.HOWLINGCAVE)
- ) {
+ if (LocationHandler.getCurrentLocation().equals(Locations.HOWLINGCAVE)) {
drawSlayer(width, offset, mc);
} else drawRainDuration(width, offset, mc);
} else if (SlayerHandler.isDoingSlayer) {
@@ -141,9 +109,7 @@ public class OverlayHud extends Gui {
public void drawSeasonAndDate(int width, int offset, Minecraft mc) {
if (SeasonDateHandler.getCurrentSeason() != Season.ERROR) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- if (
- mc.thePlayer.ticksExisted % 100 == 0 && eventToggle
- ) eventToggle = false;
+ if (mc.thePlayer.ticksExisted % 100 == 0 && eventToggle) eventToggle = false;
if (mc.thePlayer.ticksExisted % 600 == 0) eventToggle = true;
mc.renderEngine.bindTexture(GuiTextures.overlay);
String dateText = SeasonDateHandler.getFancySeasonAndDate();
@@ -152,9 +118,7 @@ public class OverlayHud extends Gui {
!SeasonDateHandler.getCurrentEvent().isEmpty() &&
!SeasonDateHandler.getCurrentEventTime().isEmpty()
) dateText =
- SeasonDateHandler.getCurrentEvent().trim() +
- " " +
- SeasonDateHandler.getCurrentEventTime().trim();
+ SeasonDateHandler.getCurrentEvent().trim() + " " + SeasonDateHandler.getCurrentEventTime().trim();
drawTexturedModalRect(
(width / 2) + 17,
offset + (bossBarVisible ? 20 : 3),
@@ -179,13 +143,7 @@ public class OverlayHud extends Gui {
8,
8
);
- drawString(
- font,
- dateText,
- (width / 2) + 18,
- offset + (bossBarVisible ? 23 : 6),
- 0xffffff
- );
+ drawString(font, dateText, (width / 2) + 18, offset + (bossBarVisible ? 23 : 6), 0xffffff);
}
}
@@ -193,13 +151,7 @@ public class OverlayHud extends Gui {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
drawTexturedModalRect(
- (width / 2) -
- 33 -
- (
- font.getStringWidth(
- LocationHandler.getCurrentLocation().getDisplayName()
- )
- ),
+ (width / 2) - 33 - (font.getStringWidth(LocationHandler.getCurrentLocation().getDisplayName())),
offset + (bossBarVisible ? 20 : 3),
0,
34,
@@ -207,36 +159,15 @@ public class OverlayHud extends Gui {
14
);
drawTexturedModalRect(
- (
- (width / 2) -
- 33 -
- (
- font.getStringWidth(
- LocationHandler.getCurrentLocation().getDisplayName()
- )
- )
- ) +
- 2,
+ ((width / 2) - 33 - (font.getStringWidth(LocationHandler.getCurrentLocation().getDisplayName()))) + 2,
offset + (bossBarVisible ? 20 : 3),
2,
34,
- font.getStringWidth(
- LocationHandler.getCurrentLocation().getDisplayName()
- ) +
- 14,
+ font.getStringWidth(LocationHandler.getCurrentLocation().getDisplayName()) + 14,
14
);
drawTexturedModalRect(
- (
- (width / 2) -
- 33 -
- (
- font.getStringWidth(
- LocationHandler.getCurrentLocation().getDisplayName()
- )
- )
- ) +
- 4,
+ ((width / 2) - 33 - (font.getStringWidth(LocationHandler.getCurrentLocation().getDisplayName()))) + 4,
offset + (bossBarVisible ? 23 : 6),
LocationHandler.getCurrentLocation().getCategory().getTexturePos(),
8,
@@ -246,13 +177,7 @@ public class OverlayHud extends Gui {
drawString(
font,
LocationHandler.getCurrentLocation().getDisplayName(),
- (width / 2) -
- 19 -
- (
- font.getStringWidth(
- LocationHandler.getCurrentLocation().getDisplayName()
- )
- ),
+ (width / 2) - 19 - (font.getStringWidth(LocationHandler.getCurrentLocation().getDisplayName())),
offset + (bossBarVisible ? 23 : 6),
0xFFFFFF
);
@@ -263,29 +188,10 @@ public class OverlayHud extends Gui {
mc.renderEngine.bindTexture(GuiTextures.overlay);
int redstoneColor = IslandHandler.redstone > 90
? 0xFF0000
- : IslandHandler.redstone > 75
- ? 0xC45B00
- : IslandHandler.redstone > 50 ? 0xFFFF55 : 0x55FF55;
- if (
- IslandHandler.redstone > 0 &&
- Utils.isPlayerHoldingRedstone(mc.thePlayer)
- ) {
- drawTexturedModalRect(
- (width / 2) - 15,
- offset + (bossBarVisible ? 51 : 34),
- 0,
- 48,
- 30,
- 18
- );
- drawTexturedModalRect(
- (width / 2) - 4,
- offset + (bossBarVisible ? 51 : 34),
- 59,
- 0,
- 8,
- 8
- );
+ : IslandHandler.redstone > 75 ? 0xC45B00 : IslandHandler.redstone > 50 ? 0xFFFF55 : 0x55FF55;
+ if (IslandHandler.redstone > 0 && Utils.isPlayerHoldingRedstone(mc.thePlayer)) {
+ drawTexturedModalRect((width / 2) - 15, offset + (bossBarVisible ? 51 : 34), 0, 48, 30, 18);
+ drawTexturedModalRect((width / 2) - 4, offset + (bossBarVisible ? 51 : 34), 59, 0, 8, 8);
drawCenteredString(
mc.fontRendererObj,
IslandHandler.redstone + "%",
@@ -310,21 +216,8 @@ public class OverlayHud extends Gui {
font.getStringWidth(CurrencyHandler.getCoinsFormatted()) + 11,
14
);
- drawTexturedModalRect(
- xPos + 1,
- offset + (bossBarVisible ? 37 : 20),
- 34,
- 0,
- 8,
- 8
- );
- drawString(
- font,
- CurrencyHandler.getCoinsFormatted(),
- xPos + 10,
- offset + (bossBarVisible ? 38 : 21),
- 0xFFAA00
- );
+ drawTexturedModalRect(xPos + 1, offset + (bossBarVisible ? 37 : 20), 34, 0, 8, 8);
+ drawString(font, CurrencyHandler.getCoinsFormatted(), xPos + 10, offset + (bossBarVisible ? 38 : 21), 0xFFAA00);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
xPos += font.getStringWidth(CurrencyHandler.getCoinsFormatted()) + 11;
@@ -339,14 +232,7 @@ public class OverlayHud extends Gui {
font.getStringWidth(CurrencyHandler.getBitsFormatted()) + 11,
14
);
- drawTexturedModalRect(
- xPos + 1,
- offset + (bossBarVisible ? 37 : 20),
- 75,
- 0,
- 8,
- 8
- );
+ drawTexturedModalRect(xPos + 1, offset + (bossBarVisible ? 37 : 20), 75, 0, 8, 8);
drawString(
font,
CurrencyHandler.getBitsFormatted(),
@@ -356,40 +242,25 @@ public class OverlayHud extends Gui {
);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
- xPos +=
- font.getStringWidth(CurrencyHandler.getBitsFormatted()) + 11;
+ xPos += font.getStringWidth(CurrencyHandler.getBitsFormatted()) + 11;
}
- drawTexturedModalRect(
- xPos,
- offset + (bossBarVisible ? 35 : 18),
- 252,
- 34,
- 4,
- 14
- );
+ drawTexturedModalRect(xPos, offset + (bossBarVisible ? 35 : 18), 252, 34, 4, 14);
}
public void drawFlightDuration(int width, int offset, Minecraft mc) {
if (LocationHandler.getCurrentLocation().equals(Locations.YOURISLAND)) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- DecimalFormat flightFormat = new DecimalFormat(
- "#.#",
- DecimalFormatSymbols.getInstance(Locale.CANADA)
- );
+ DecimalFormat flightFormat = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.CANADA));
String duration;
- if (IslandHandler.flightTime < 60) duration =
- IslandHandler.flightTime + "s"; else if (
+ if (IslandHandler.flightTime < 60) duration = IslandHandler.flightTime + "s"; else if (
IslandHandler.flightTime < 3600
- ) duration =
- flightFormat.format((double) IslandHandler.flightTime / 60) +
- "m"; else if (IslandHandler.flightTime < 86400) duration =
- flightFormat.format((double) IslandHandler.flightTime / 3600) +
- "hr"; else if (IslandHandler.flightTime < 86460) duration =
- flightFormat.format((double) IslandHandler.flightTime / 86400) +
- "day"; else duration =
- flightFormat.format((double) IslandHandler.flightTime / 86400) +
- "days";
+ ) duration = flightFormat.format((double) IslandHandler.flightTime / 60) + "m"; else if (
+ IslandHandler.flightTime < 86400
+ ) duration = flightFormat.format((double) IslandHandler.flightTime / 3600) + "hr"; else if (
+ IslandHandler.flightTime < 86460
+ ) duration = flightFormat.format((double) IslandHandler.flightTime / 86400) + "day"; else duration =
+ flightFormat.format((double) IslandHandler.flightTime / 86400) + "days";
mc.renderEngine.bindTexture(GuiTextures.overlay);
drawTexturedModalRect(
(width / 2) - 33 - (font.getStringWidth(duration)),
@@ -426,12 +297,7 @@ public class OverlayHud extends Gui {
}
public void drawRainDuration(int width, int offset, Minecraft mc) {
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.PARK)
- ) {
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
String duration = "Rain: " + ParkIslandHandler.getRainTime();
@@ -536,12 +402,7 @@ public class OverlayHud extends Gui {
}
public void drawMithril(int width, int offset, Minecraft mc) {
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.DWARVENMINES)
- ) {
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.DWARVENMINES)) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
String mithril = DwarvenMineHandler.getMithrilFormatted();
@@ -580,12 +441,7 @@ public class OverlayHud extends Gui {
}
public void drawTrapperOrPelts(int width, int offset, Minecraft mc) {
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.MUSHROOMDESERT)
- ) {
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
String duration = FarmingIslandHandler.location != Locations.NONE
@@ -626,19 +482,11 @@ public class OverlayHud extends Gui {
}
public void drawDwarvenEvent(int width, int offset, Minecraft mc) {
- if (
- LocationHandler
- .getCurrentLocation()
- .getCategory()
- .equals(LocationCategory.DWARVENMINES)
- ) {
+ if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.DWARVENMINES)) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(GuiTextures.overlay);
if (DwarvenMineHandler.eventMax > 0) {
- String duration =
- DwarvenMineHandler.eventProgress +
- "/" +
- DwarvenMineHandler.eventMax;
+ String duration = DwarvenMineHandler.eventProgress + "/" + DwarvenMineHandler.eventMax;
drawTexturedModalRect(
(width / 2) - 33 - (font.getStringWidth(duration)),
offset + (bossBarVisible ? 35 : 18),
@@ -709,25 +557,15 @@ public class OverlayHud extends Gui {
@SubscribeEvent
public void renderOverlay(RenderGameOverlayEvent.Post event) {
- if (
- Utils.overlayShouldRender(
- event.type,
- SkyblockHud.hasSkyblockScoreboard()
- )
- ) {
+ if (Utils.overlayShouldRender(event.type, SkyblockHud.hasSkyblockScoreboard())) {
bossBarVisible =
- BossStatus.statusBarTime > 0 &&
- GuiIngameForge.renderBossHealth &&
- BossbarHandler.bossBarRendered;
+ BossStatus.statusBarTime > 0 && GuiIngameForge.renderBossHealth && BossbarHandler.bossBarRendered;
Minecraft mc = Minecraft.getMinecraft();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
if (LocationHandler.getCurrentLocation() != Locations.CATACOMBS) {
drawClock(
event.resolution.getScaledWidth(),
- SkyblockHud.config.main.mainHudPos.getAbsY(
- event.resolution,
- 34
- ),
+ SkyblockHud.config.main.mainHudPos.getAbsY(event.resolution, 34),
mc
);
}
@@ -735,21 +573,9 @@ public class OverlayHud extends Gui {
}
}
- public void drawScaledString(
- float factor,
- int x,
- int y,
- String text,
- int color
- ) {
+ public void drawScaledString(float factor, int x, int y, String text, int color) {
GlStateManager.scale(factor, factor, 1);
- drawCenteredString(
- font,
- text,
- (int) (x / factor),
- (int) (y / factor),
- color
- );
+ drawCenteredString(font, text, (int) (x / factor), (int) (y / factor), color);
GlStateManager.scale(1 / factor, 1 / factor, 1);
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java b/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
index 885ff7a..dce51a9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
@@ -40,15 +40,10 @@ public class RPGHud extends Gui {
}
public static void manaPredictionUpdate(boolean isIncrease, int decrease) {
- mana =
- isIncrease
- ? Math.min(mana + (maxMana / 50), maxMana)
- : mana - decrease;
+ mana = isIncrease ? Math.min(mana + (maxMana / 50), maxMana) : mana - decrease;
}
- private static final DecimalFormat decimalFormat = new DecimalFormat(
- "#.##"
- );
+ private static final DecimalFormat decimalFormat = new DecimalFormat("#.##");
static {
decimalFormat.setGroupingUsed(true);
@@ -65,10 +60,7 @@ public class RPGHud extends Gui {
)
) MinecraftForge.EVENT_BUS.post(
new RenderGameOverlayEvent.Post(
- new RenderGameOverlayEvent(
- event.partialTicks,
- event.resolution
- ),
+ new RenderGameOverlayEvent(event.partialTicks, event.resolution),
RenderGameOverlayEvent.ElementType.EXPERIENCE
)
);
@@ -84,17 +76,7 @@ public class RPGHud extends Gui {
GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
FontRenderer font = mc.fontRendererObj;
if (mc.thePlayer.getHealth() < mc.thePlayer.getMaxHealth()) {
- health =
- Math.max(
- (int) (
- maxHealth *
- (
- mc.thePlayer.getHealth() /
- mc.thePlayer.getMaxHealth()
- )
- ),
- health
- );
+ health = Math.max((int) (maxHealth * (mc.thePlayer.getHealth() / mc.thePlayer.getMaxHealth())), health);
}
mc.renderEngine.bindTexture(GuiTextures.playerStat);
@@ -107,10 +89,7 @@ public class RPGHud extends Gui {
drawTexturedModalRect(x, y, rightAligned ? 131 : 5, 6, 120, 47);
- float manaWidth = Math.min(
- 57 * ((float) mana / (float) maxMana),
- 57
- );
+ float manaWidth = Math.min(57 * ((float) mana / (float) maxMana), 57);
drawTexturedModalRect(
rightAligned ? x + 16 : 47 + x,
17 + y,
@@ -120,10 +99,7 @@ public class RPGHud extends Gui {
4
);
- float healthWidth = Math.min(
- 70 * ((float) health / (float) maxHealth),
- 70
- );
+ float healthWidth = Math.min(70 * ((float) health / (float) maxHealth), 70);
drawTexturedModalRect(
rightAligned ? x + 3 : 47 + x,
22 + y,
@@ -134,10 +110,7 @@ public class RPGHud extends Gui {
);
if (health > maxHealth) {
- float absorptionWidth = Math.min(
- 70 * ((float) (health - maxHealth) / (float) maxHealth),
- 70
- );
+ float absorptionWidth = Math.min(70 * ((float) (health - maxHealth) / (float) maxHealth), 70);
drawTexturedModalRect(
rightAligned ? x + 3 : 47 + x,
22 + y,
@@ -149,27 +122,13 @@ public class RPGHud extends Gui {
}
float xpWidth = 67 * mc.thePlayer.experience;
- drawTexturedModalRect(
- rightAligned ? x + 7 : 45 + x,
- 28 + y,
- rightAligned ? 189 : 0,
- 73,
- (int) xpWidth,
- 4
- );
+ drawTexturedModalRect(rightAligned ? x + 7 : 45 + x, 28 + y, rightAligned ? 189 : 0, 73, (int) xpWidth, 4);
//Air in water
NumberFormat myFormat = NumberFormat.getInstance();
myFormat.setGroupingUsed(true);
if (mc.thePlayer.getAir() < 300) {
float airWidth = 60 * ((float) mc.thePlayer.getAir() / 300);
- drawTexturedModalRect(
- rightAligned ? x + 17 : 39 + x,
- 33 + y,
- rightAligned ? 192 : 0,
- 82,
- 64,
- 6
- );
+ drawTexturedModalRect(rightAligned ? x + 17 : 39 + x, 33 + y, rightAligned ? 192 : 0, 82, 64, 6);
drawTexturedModalRect(
rightAligned ? x + 19 : 41 + x,
33 + y,
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
index a37726f..44a250f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
@@ -18,43 +18,23 @@ public class ActionBarParsing {
private static String lastLowActionBar = "";
private static IChatComponent lastLowEditedActionBar = null;
- private static final Pattern HealthRegex = Pattern.compile(
- "([0-9]+)/([0-9]+)\u2764"
- );
- private static final Pattern HealingRegex = Pattern.compile(
- "\\+([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]"
- );
- private static final Pattern DefenseRegex = Pattern.compile(
- "([0-9]+)\u2748 Defense"
- );
- private static final Pattern ManaRegex = Pattern.compile(
- "([0-9]+)/([0-9]+)\u270E Mana"
- );
- private static final Pattern ManaOverflowRegex = Pattern.compile(
- "([0-9]+)/([0-9]+)\u270E ([0-9]+)\u02AC"
- );
- private static final Pattern ManaDecreaseRegex = Pattern.compile(
- "-([0-9]+) Mana \\("
- );
+ private static final Pattern HealthRegex = Pattern.compile("([0-9]+)/([0-9]+)\u2764");
+ private static final Pattern HealingRegex = Pattern.compile("\\+([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");
+ private static final Pattern DefenseRegex = Pattern.compile("([0-9]+)\u2748 Defense");
+ private static final Pattern ManaRegex = Pattern.compile("([0-9]+)/([0-9]+)\u270E Mana");
+ private static final Pattern ManaOverflowRegex = Pattern.compile("([0-9]+)/([0-9]+)\u270E ([0-9]+)\u02AC");
+ private static final Pattern ManaDecreaseRegex = Pattern.compile("-([0-9]+) Mana \\(");
private static final Pattern XpGainRegex = Pattern.compile(
"\\+(\\d*\\.?\\d*) (Farming|Mining|Combat|Foraging|Fishing|Enchanting|Alchemy|Carpentry|Runecrafting) \\((\\d*\\.?\\d*)%\\)"
);
- private static final Pattern HealthReplaceRegex = Pattern.compile(
- "\u00A7c([0-9]+)/([0-9]+)\u2764"
- );
+ private static final Pattern HealthReplaceRegex = Pattern.compile("\u00A7c([0-9]+)/([0-9]+)\u2764");
private static final Pattern HealingReplaceRegex = Pattern.compile(
"\\+\u00A7c([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]"
);
- private static final Pattern HealthAbsorptionReplaceRegex = Pattern.compile(
- "\u00A76([0-9]+)/([0-9]+)\u2764"
- );
- private static final Pattern DefenseReplaceRegex = Pattern.compile(
- "\u00A7a([0-9]+)\u00A7a\u2748 Defense"
- );
- private static final Pattern ManaReplaceRegex = Pattern.compile(
- "\u00A7b([0-9]+)/([0-9]+)\u270E Mana"
- );
+ private static final Pattern HealthAbsorptionReplaceRegex = Pattern.compile("\u00A76([0-9]+)/([0-9]+)\u2764");
+ private static final Pattern DefenseReplaceRegex = Pattern.compile("\u00A7a([0-9]+)\u00A7a\u2748 Defense");
+ private static final Pattern ManaReplaceRegex = Pattern.compile("\u00A7b([0-9]+)/([0-9]+)\u270E Mana");
private static final Pattern ManaOverflowReplaceRegex = Pattern.compile(
"\u00A7b([0-9]+)/([0-9]+)\u270E \u00A73([0-9]+)\u02AC"
);
@@ -66,10 +46,7 @@ public class ActionBarParsing {
public void tick(TickEvent.ClientTickEvent event) {
if (predict) {
ticksSinceLastPrediction++;
- if (
- ticksSinceLastPrediction == 20 &&
- SkyblockHud.config.rpg.showRpgHud
- ) {
+ if (ticksSinceLastPrediction == 20 && SkyblockHud.config.rpg.showRpgHud) {
ticksSinceLastPrediction = 0;
RPGHud.manaPredictionUpdate(true, 0);
}
@@ -78,37 +55,22 @@ public class ActionBarParsing {
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onStatusBarHigh(ClientChatReceivedEvent event) {
- if (
- event.type == 2 &&
- SkyblockHud.hasSkyblockScoreboard() &&
- SkyblockHud.config.rpg.showRpgHud
- ) {
+ if (event.type == 2 && SkyblockHud.hasSkyblockScoreboard() && SkyblockHud.config.rpg.showRpgHud) {
parseActionBar(event.message.getUnformattedText());
}
}
@SubscribeEvent(priority = EventPriority.LOW)
public void onStatusBarLow(ClientChatReceivedEvent event) {
- if (
- event.type == 2 &&
- SkyblockHud.hasSkyblockScoreboard() &&
- SkyblockHud.config.rpg.showRpgHud
- ) {
+ if (event.type == 2 && SkyblockHud.hasSkyblockScoreboard() && SkyblockHud.config.rpg.showRpgHud) {
String message = event.message.getUnformattedText();
- if (
- lastLowEditedActionBar == null ||
- !lastLowActionBar.equals(message)
- ) {
+ if (lastLowEditedActionBar == null || !lastLowActionBar.equals(message)) {
lastLowActionBar = message;
message = HealthReplaceRegex.matcher(message).replaceAll("");
- message =
- HealthAbsorptionReplaceRegex
- .matcher(message)
- .replaceAll("");
+ message = HealthAbsorptionReplaceRegex.matcher(message).replaceAll("");
message = DefenseReplaceRegex.matcher(message).replaceAll("");
message = ManaReplaceRegex.matcher(message).replaceAll("");
- message =
- ManaOverflowReplaceRegex.matcher(message).replaceAll("");
+ message = ManaOverflowReplaceRegex.matcher(message).replaceAll("");
lastLowEditedActionBar = new ChatComponentText(message.trim());
}
@@ -145,19 +107,14 @@ public class ActionBarParsing {
}
if (defenseFound) {
try {
- RPGHud.updateDefense(
- Integer.parseInt(DefenseMatcher.group(1))
- );
+ RPGHud.updateDefense(Integer.parseInt(DefenseMatcher.group(1)));
} catch (Exception ignored) {}
} else if (!xpFound && !manaUseFound) {
RPGHud.updateDefense(0);
}
if (manaFound) {
try {
- RPGHud.updateMana(
- Integer.parseInt(ManaMatcher.group(1)),
- Integer.parseInt(ManaMatcher.group(2))
- );
+ RPGHud.updateMana(Integer.parseInt(ManaMatcher.group(1)), Integer.parseInt(ManaMatcher.group(2)));
} catch (Exception ignored) {}
}
if (!manaFound && manaOverflowFound) {
@@ -166,18 +123,13 @@ public class ActionBarParsing {
Integer.parseInt(ManaOverflowMatcher.group(1)),
Integer.parseInt(ManaOverflowMatcher.group(2))
);
- RPGHud.updateOverflow(
- Integer.parseInt(ManaOverflowMatcher.group(3))
- );
+ RPGHud.updateOverflow(Integer.parseInt(ManaOverflowMatcher.group(3)));
} catch (Exception ignored) {}
}
if (!manaFound) {
if (manaUseFound) {
try {
- RPGHud.manaPredictionUpdate(
- false,
- Integer.parseInt(ManaUseMatcher.group(1))
- );
+ RPGHud.manaPredictionUpdate(false, Integer.parseInt(ManaUseMatcher.group(1)));
} catch (Exception ignored) {}
}
RPGHud.manaPredictionUpdate(true, 0);
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java
index 609b3b7..ef61b43 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java
@@ -14,25 +14,10 @@ public class SeasonDateHandler {
@SubscribeEvent
public void onSidebarLineUpdate(SidebarLineUpdateEvent event) {
- if (
- Season.get(
- SeasonDateHandler
- .removeDate(event.formattedLine.toLowerCase())
- .toUpperCase()
- ) !=
- Season.ERROR
- ) {
+ if (Season.get(SeasonDateHandler.removeDate(event.formattedLine.toLowerCase()).toUpperCase()) != Season.ERROR) {
SeasonDateHandler.setCurrentDateAndSeason(
- SeasonDateHandler.removeSeason(
- Utils.removeColor(event.formattedLine.toLowerCase().trim())
- ),
- SeasonDateHandler
- .removeDate(
- Utils.removeColor(
- event.formattedLine.toLowerCase().trim()
- )
- )
- .toUpperCase()
+ SeasonDateHandler.removeSeason(Utils.removeColor(event.formattedLine.toLowerCase().trim())),
+ SeasonDateHandler.removeDate(Utils.removeColor(event.formattedLine.toLowerCase().trim())).toUpperCase()
);
}
}
@@ -70,12 +55,7 @@ public class SeasonDateHandler {
}
public static String getFancySeasonAndDate() {
- return (
- currentSeason.getDisplayName() +
- " " +
- currentDate +
- getDataSuffix(currentDate)
- );
+ return (currentSeason.getDisplayName() + " " + currentDate + getDataSuffix(currentDate));
}
public static String getCurrentEvent() {
@@ -96,12 +76,6 @@ public class SeasonDateHandler {
}
public static int removeSeason(String seasonDate) {
- return Integer.parseInt(
- Pattern
- .compile("[^0-9]")
- .matcher(seasonDate.toLowerCase())
- .replaceAll("")
- .trim()
- );
+ return Integer.parseInt(Pattern.compile("[^0-9]").matcher(seasonDate.toLowerCase()).replaceAll("").trim());
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java
index 552837b..8f0608d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java
@@ -34,9 +34,7 @@ public class KillTrackerHandler {
NBTTagCompound tag = new NBTTagCompound();
event.entity.writeToNBT(tag);
System.out.println("Tag : " + tag);
- System.out.println(
- "Damage : " + getDamageSourceString(event.source)
- );
+ System.out.println("Damage : " + getDamageSourceString(event.source));
System.out.println(
"----------------------------------------------------------------------------------------------------------------"
);
@@ -74,11 +72,7 @@ public class KillTrackerHandler {
@SubscribeEvent
public void onWorldChange(EntityJoinWorldEvent event) {
if (event.entity != null) {
- if (
- event.entity
- .getUniqueID()
- .equals(Minecraft.getMinecraft().thePlayer.getUniqueID())
- ) {
+ if (event.entity.getUniqueID().equals(Minecraft.getMinecraft().thePlayer.getUniqueID())) {
attackedEntities.clear();
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java
index 7035fee..ba22101 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java
@@ -23,24 +23,15 @@ public class TrackerFileLoader {
public static ItemStack getDisplayItem(JsonObject jsonObject) {
int meta = jsonObject.get("meta").getAsInt();
String displayItemId = jsonObject.get("item").getAsString();
- Item item = Item.itemRegistry.getObject(
- new ResourceLocation(displayItemId)
- );
+ Item item = Item.itemRegistry.getObject(new ResourceLocation(displayItemId));
ItemStack stack = new ItemStack(item, 0, meta);
- if (
- jsonObject.has("skullData") &&
- displayItemId.equals("minecraft:skull") &&
- meta == 3
- ) {
- stack.setTagInfo(
- "SkullOwner",
- getSkullTag(jsonObject.getAsJsonObject("skullData"))
- );
+ if (jsonObject.has("skullData") && displayItemId.equals("minecraft:skull") && meta == 3) {
+ stack.setTagInfo("SkullOwner", getSkullTag(jsonObject.getAsJsonObject("skullData")));
}
- if (
- jsonObject.has("enchanted") &&
- jsonObject.get("enchanted").getAsBoolean()
- ) stack.setTagInfo("ench", new NBTTagList());
+ if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) stack.setTagInfo(
+ "ench",
+ new NBTTagList()
+ );
return stack;
}
@@ -65,10 +56,7 @@ public class TrackerFileLoader {
for (JsonElement element : object.get("trackers").getAsJsonArray()) {
JsonObject tracker = element.getAsJsonObject();
StringBuilder builder = new StringBuilder();
- tracker
- .get("location")
- .getAsJsonArray()
- .forEach(loc -> builder.append(loc.getAsString()));
+ tracker.get("location").getAsJsonArray().forEach(loc -> builder.append(loc.getAsString()));
String location = builder.toString();
Map<String, ItemStack> stacks = new HashMap<>();
@@ -76,42 +64,27 @@ public class TrackerFileLoader {
JsonObject dropObject = drop.getAsJsonObject();
//Display Item Creation
- ItemStack stack = getDisplayItem(
- dropObject.getAsJsonObject("displayItem")
- );
+ ItemStack stack = getDisplayItem(dropObject.getAsJsonObject("displayItem"));
String itemId = dropObject.get("id").getAsString();
stacks.put(itemId, stack);
}
- String event = tracker.has("event")
- ? tracker.get("event").getAsString()
- : null;
+ String event = tracker.has("event") ? tracker.get("event").getAsString() : null;
Map<String, Map<String, ItemStack>> events = new HashMap<>();
events.put(event, stacks);
if (TrackerHandler.trackers.containsKey(location)) {
- TrackerHandler.trackers
- .get(location)
- .dropTrackers.put(event, stacks);
+ TrackerHandler.trackers.get(location).dropTrackers.put(event, stacks);
} else {
- TrackerHandler.trackers.putIfAbsent(
- location,
- new TrackerHandler.TrackerData(events)
- );
+ TrackerHandler.trackers.putIfAbsent(location, new TrackerHandler.TrackerData(events));
}
tracker
.get("location")
.getAsJsonArray()
- .forEach(
- loc ->
- TrackerHandler.trackerIds.put(
- Locations.get(loc.getAsString()),
- location
- )
- );
+ .forEach(loc -> TrackerHandler.trackerIds.put(Locations.get(loc.getAsString()), location));
}
}
@@ -124,16 +97,13 @@ public class TrackerFileLoader {
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("location", locations);
- if (event == null) jsonObject.add(
+ if (event == null) jsonObject.add("event", new JsonNull()); else jsonObject.addProperty(
"event",
- new JsonNull()
- ); else jsonObject.addProperty("event", event);
+ event
+ );
JsonObject dropsData = new JsonObject();
- drops.forEach(
- (s, stack) ->
- dropsData.addProperty(s, stack.stackSize)
- );
+ drops.forEach((s, stack) -> dropsData.addProperty(s, stack.stackSize));
jsonObject.add("drops", dropsData);
trackerStats.add(jsonObject);
}
@@ -146,20 +116,10 @@ public class TrackerFileLoader {
public static void loadTrackersFile() {
try {
- ResourceLocation trackers = new ResourceLocation(
- "skyblockhud:data/trackers.json"
- );
- InputStream is = Minecraft
- .getMinecraft()
- .getResourceManager()
- .getResource(trackers)
- .getInputStream();
+ ResourceLocation trackers = new ResourceLocation("skyblockhud:data/trackers.json");
+ InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(trackers).getInputStream();
- try (
- BufferedReader reader = new BufferedReader(
- new InputStreamReader(is, StandardCharsets.UTF_8)
- )
- ) {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
loadTrackers(gson.fromJson(reader, JsonObject.class));
}
} catch (Exception ignored) {}
@@ -175,10 +135,7 @@ public class TrackerFileLoader {
try (
BufferedReader reader = new BufferedReader(
- new InputStreamReader(
- new FileInputStream(configFile),
- StandardCharsets.UTF_8
- )
+ new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)
)
) {
JsonObject json = gson.fromJson(reader, JsonObject.class);
@@ -189,37 +146,25 @@ public class TrackerFileLoader {
element -> {
if (element.isJsonObject()) {
JsonObject object = element.getAsJsonObject();
- String location = object
- .get("location")
- .getAsString();
- Map<String, Map<String, ItemStack>> trackers = TrackerHandler.trackers.get(
- location
- )
+ String location = object.get("location").getAsString();
+ Map<String, Map<String, ItemStack>> trackers = TrackerHandler.trackers.get(location)
.dropTrackers;
JsonElement event = object.get("event");
- String eventString = event == null ||
- event.isJsonNull()
+ String eventString = event == null || event.isJsonNull()
? null
: event.getAsString();
- Map<String, ItemStack> drops = trackers.get(
- eventString
- );
+ Map<String, ItemStack> drops = trackers.get(eventString);
if (drops != null) {
for (Map.Entry<String, JsonElement> drop : object
.getAsJsonObject("drops")
.entrySet()) {
- if (
- drops.containsKey(drop.getKey())
- ) {
- drops.get(drop.getKey())
- .stackSize =
- drop.getValue().getAsInt();
+ if (drops.containsKey(drop.getKey())) {
+ drops.get(drop.getKey()).stackSize = drop.getValue().getAsInt();
}
}
- drops =
- TrackerHandler.sortTrackers(drops);
+ drops = TrackerHandler.sortTrackers(drops);
trackers.put(eventString, drops);
}
}
@@ -239,10 +184,7 @@ public class TrackerFileLoader {
try (
BufferedWriter writer = new BufferedWriter(
- new OutputStreamWriter(
- new FileOutputStream(configFile),
- StandardCharsets.UTF_8
- )
+ new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8)
)
) {
JsonObject json = new JsonObject();
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
index 8c8a521..2d5607f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
@@ -37,30 +37,16 @@ public class TrackerHandler {
}
private boolean eventGoing() {
- return SeasonDateHandler
- .getCurrentEventTime()
- .trim()
- .toLowerCase()
- .contains("ends in");
+ return SeasonDateHandler.getCurrentEventTime().trim().toLowerCase().contains("ends in");
}
}
public static Map<String, TrackerData> trackers = new HashMap<>();
public static Map<Locations, String> trackerIds = new HashMap<>();
- public static Map<String, ItemStack> sortTrackers(
- Map<String, ItemStack> map
- ) {
- List<Map.Entry<String, ItemStack>> list = new ArrayList<>(
- map.entrySet()
- );
- list.sort(
- (entry1, entry2) ->
- Integer.compare(
- entry2.getValue().stackSize,
- entry1.getValue().stackSize
- )
- );
+ public static Map<String, ItemStack> sortTrackers(Map<String, ItemStack> map) {
+ List<Map.Entry<String, ItemStack>> list = new ArrayList<>(map.entrySet());
+ list.sort((entry1, entry2) -> Integer.compare(entry2.getValue().stackSize, entry1.getValue().stackSize));
Map<String, ItemStack> result = new LinkedHashMap<>();
for (Map.Entry<String, ItemStack> entry : list) {
@@ -70,26 +56,12 @@ public class TrackerHandler {
return result;
}
- public static void onItemAdded(
- String id,
- int amount,
- String enchant,
- int level
- ) {
- if (
- SkyblockHud.hasSkyblockScoreboard() &&
- trackerIds.containsKey(LocationHandler.getCurrentLocation())
- ) {
- String trackerId = trackerIds.get(
- LocationHandler.getCurrentLocation()
- );
+ public static void onItemAdded(String id, int amount, String enchant, int level) {
+ if (SkyblockHud.hasSkyblockScoreboard() && trackerIds.containsKey(LocationHandler.getCurrentLocation())) {
+ String trackerId = trackerIds.get(LocationHandler.getCurrentLocation());
TrackerData tracked = trackers.get(trackerId);
- String dropTrackerId = tracked.getDropId(
- SeasonDateHandler.getCurrentEvent()
- );
- Map<String, ItemStack> tracker = tracked.dropTrackers.get(
- dropTrackerId
- );
+ String dropTrackerId = tracked.getDropId(SeasonDateHandler.getCurrentEvent());
+ Map<String, ItemStack> tracker = tracked.dropTrackers.get(dropTrackerId);
String dropId = id;
if (enchant != null) {
dropId = enchant.toUpperCase() + ";" + level;
@@ -123,9 +95,7 @@ public class TrackerHandler {
!SkyblockHud.config.trackers.hideTracker
)
) {
- String trackerId = trackerIds.get(
- LocationHandler.getCurrentLocation()
- );
+ String trackerId = trackerIds.get(LocationHandler.getCurrentLocation());
Minecraft mc = Minecraft.getMinecraft();
TrackerData tracked = trackers.get(trackerId);
@@ -134,29 +104,16 @@ public class TrackerHandler {
);
if (tracker != null) {
Position pos = SkyblockHud.config.trackers.trackerPosition;
- int startPos = pos.getAbsX(
- event.resolution,
- (tracker.size() >= 6 ? 120 : tracker.size() * 20)
- );
- int y = pos.getAbsY(
- event.resolution,
- (int) (10 + Math.ceil(tracker.size() / 5d) * 20)
- );
+ int startPos = pos.getAbsX(event.resolution, (tracker.size() >= 6 ? 120 : tracker.size() * 20));
+ int y = pos.getAbsY(event.resolution, (int) (10 + Math.ceil(tracker.size() / 5d) * 20));
Gui.drawRect(startPos, y, startPos + 120, y + 10, -1072689136);
- mc.fontRendererObj.drawString(
- "Tracker",
- startPos + 4,
- y + 1,
- 0xffffff,
- false
- );
+ mc.fontRendererObj.drawString("Tracker", startPos + 4, y + 1, 0xffffff, false);
y += 10;
Gui.drawRect(
startPos,
y,
- startPos +
- (tracker.size() >= 6 ? 120 : tracker.size() * 20),
+ startPos + (tracker.size() >= 6 ? 120 : tracker.size() * 20),
(int) (y + (Math.ceil(tracker.size() / 5d) * 20)),
1610612736
);
@@ -170,9 +127,7 @@ public class TrackerHandler {
GlStateManager.disableBlend();
mc.fontRendererObj.drawStringWithShadow(
s,
- (float) (
- x + 19 - 2 - mc.fontRendererObj.getStringWidth(s)
- ),
+ (float) (x + 19 - 2 - mc.fontRendererObj.getStringWidth(s)),
(float) (y + 9),
stack.stackSize < 1 ? 16733525 : 16777215
);