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) {