aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java57
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt (renamed from src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt)41
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt (renamed from src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt)0
3 files changed, 59 insertions, 39 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 4e4b147e..1a50dfe4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -311,8 +311,8 @@ public class CalendarOverlay {
STAR_CULT_STACK,
Arrays.asList(
"§3The Cult of the Fallen Star meets then.",
- "§3Attending may give a reward",
- "§3You can find them near the Star in the Dwarven Mines"
+ "§3Attending may give a reward.",
+ "§3You can find them near the Star in the Dwarven Mines."
),
STAR_CULT_DURATION,
true
@@ -352,7 +352,6 @@ public class CalendarOverlay {
)
);
}
-
}
}
@@ -453,42 +452,42 @@ public class CalendarOverlay {
addEvent(
new SkyBlockTime(thisBaseYear + scorpiusOffset, 3, 27, 0, 0, 0),
new SBEvent("special_mayor:scorpius",
- "§dScorpius",
+ "§dScorpius' Candidacy",
true,
Utils.createSkull(
"Scorpius",
"ba2cd37d-a0e4-4dc5-b15c-d79ee1051aae",
"ewogICJ0aW1lc3RhbXAiIDogMTU5Nzc4MTc1NzIxOSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGYyNmZhMGM0NzUzNmU3OGUzMzcyNTdkODk4YWY4YjFlYmM4N2MwODk0NTAzMzc1MjM0MDM1ZmYyYzdlZjhmMCIKICAgIH0KICB9Cn0"
),
- Arrays.asList("§eScorpius is a special Mayor candidate"), -1, true
+ Arrays.asList("§eScorpius becomes a special Mayor candidate"), -1, true
)
);
addEvent(
new SkyBlockTime(thisBaseYear + derpyOffset, 3, 27, 0, 0, 0),
new SBEvent(
"special_mayor:derpy",
- "§dDerpy",
+ "§dDerpy's Candidacy",
true,
Utils.createSkull(
"Derpy",
"ab36a707-96d3-3db1-ab36-a70796d3adb1",
"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjQ1MGQxMjY5Mjg4NmM0N2IwNzhhMzhmNGQ0OTJhY2ZlNjEyMTZlMmQwMjM3YWI4MjQzMzQwOWIzMDQ2YjQ2NCJ9fX0"
),
- Arrays.asList("§eDerpy is a special Mayor candidate"), -1, true
+ Arrays.asList("§eDerpy becomes a special Mayor candidate"), -1, true
)
);
addEvent(
new SkyBlockTime(thisBaseYear + jerryOffset, 3, 27, 0, 0, 0),
new SBEvent(
"special_mayor:jerry",
- "§dJerry",
+ "§dJerry's Candidacy",
true,
Utils.createSkull(
"Jerry",
"0a9e8efb-9191-4c81-80f5-e27ca5433156",
"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODIyZDhlNzUxYzhmMmZkNGM4OTQyYzQ0YmRiMmY1Y2E0ZDhhZThlNTc1ZWQzZWIzNGMxOGE4NmU5M2IifX19"
),
- Arrays.asList("§eJerry is a special Mayor candidate"), -1, true
+ Arrays.asList("§eJerry becomes a special Mayor candidate"), -1, true
)
);
}
@@ -734,15 +733,21 @@ public class CalendarOverlay {
sbEvent.display,
EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW + prettyTime(timeUntilMillis, false)
);
- addCountdownCalculatorToTooltip(timeUntilMillis, tooltipToDisplay);
+ if (!(prettyTime(timeUntilMillis, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(timeUntilMillis, tooltipToDisplay);
+ }
if (sbEvent.lastsFor >= 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Lasts for: " + EnumChatFormatting.YELLOW +
prettyTime(sbEvent.lastsFor, true));
- addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntilMillis, tooltipToDisplay);
+ if (!(prettyTime(timeUntilMillis, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntilMillis, tooltipToDisplay);
+ }
if (timeUntilMillis < 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Time left: " + EnumChatFormatting.YELLOW +
prettyTime(sbEvent.lastsFor + timeUntilMillis, true));
- addCountdownCalculatorToTooltip(timeUntilMillis, tooltipToDisplay);
+ if ((prettyTime(timeUntilMillis, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntilMillis, tooltipToDisplay);
+ }
}
}
if (sbEvent.desc != null) {
@@ -788,7 +793,9 @@ public class CalendarOverlay {
if (mouseX >= x && mouseX <= x + 16) {
if (mouseY >= y && mouseY <= y + 16) {
- tooltipToDisplay = new ArrayList<>(sbEvent.desc);
+ tooltipToDisplay = new ArrayList<>();
+ tooltipToDisplay.add(sbEvent.display);
+ tooltipToDisplay.addAll(sbEvent.desc);
tooltipToDisplay.add(Utils.prettyTime(Duration.between(
Instant.now(),
Instant.ofEpochMilli(pair.getFirst())
@@ -841,15 +848,21 @@ public class CalendarOverlay {
nextEvent.display,
EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW + prettyTime(timeUntilNext, false)
);
- addCountdownCalculatorToTooltip(timeUntilNext, tooltipToDisplay);
+ if (!(prettyTime(timeUntilNext, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(timeUntilNext, tooltipToDisplay);
+ }
if (nextEvent.lastsFor >= 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Lasts for: " + EnumChatFormatting.YELLOW +
prettyTime(nextEvent.lastsFor, true));
- addCountdownCalculatorToTooltip(nextEvent.lastsFor + timeUntilNext, tooltipToDisplay);
+ if (!(prettyTime(timeUntilNext, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(nextEvent.lastsFor + timeUntilNext, tooltipToDisplay);
+ }
if (timeUntilNext < 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Time left: " + EnumChatFormatting.YELLOW +
prettyTime(nextEvent.lastsFor + timeUntilNext, true));
- addCountdownCalculatorToTooltip(nextEvent.lastsFor + timeUntilNext, tooltipToDisplay);
+ if ((prettyTime(timeUntilNext, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(nextEvent.lastsFor + timeUntilNext, tooltipToDisplay);
+ }
}
}
@@ -1485,15 +1498,21 @@ public class CalendarOverlay {
tooltipToDisplay.add(sbEvent.display);
tooltipToDisplay.add(
EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW + prettyTime(timeUntil, false));
- addCountdownCalculatorToTooltip(timeUntil, tooltipToDisplay);
+ if (!(prettyTime(timeUntil, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(timeUntil, tooltipToDisplay);
+ }
if (sbEvent.lastsFor >= 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Lasts for: " + EnumChatFormatting.YELLOW +
prettyTime(sbEvent.lastsFor, true));
- addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntil, tooltipToDisplay);
+ if (!(prettyTime(timeUntilNext, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntil, tooltipToDisplay);
+ }
if (timeUntil < 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Time left: " + EnumChatFormatting.YELLOW +
prettyTime(sbEvent.lastsFor + timeUntil, true));
- addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntil, tooltipToDisplay);
+ if ((prettyTime(timeUntil, false).equals("Now!"))) {
+ addCountdownCalculatorToTooltip(sbEvent.lastsFor + timeUntil, tooltipToDisplay);
+ }
}
}
if (sbEvent.id.split(":")[0].equals("jacob_farming") && sbEvent.desc != null) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt
index 11c6b721..068e735b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/CountdownCalculator.kt
@@ -27,26 +27,24 @@ import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
/*
- * CountdownCalculator.kt
- * A Kotlin class by:
- * — Erymanthus / RayDeeUx (code base, math, timestamp wrangling, adaptation into overall NEU codebase)
- * — nea89 (enum, regex wrangling, ItemTooltipEvent integration, cleanup)
- *
- * Intended to detect countdowns within item tooltips, converting the time remaining into
- * units of seconds, and then adding that result to the user's current system time
- * in Unix epoch form converted into a human readable timestamp, timezones included.
- *
- * Formerly a feature from SkyBlockCatia, then later attempted to be ported into Skytils.
- * Now has a comfy home in the NotEnoughUpdates codebase.
+ CountdownCalculator.kt
+ A Kotlin class by:
+ — Erymanthus / RayDeeUx (code base, math, timestamp wrangling, adaptation into overall NEU codebase)
+ — nea89 (enum, regex wrangling, ItemTooltipEvent integration, cleanup)
+
+ Intended to detect countdowns within item tooltips, converting the time remaining into
+ units of seconds, and then adding that result to the user's current system time
+ in Unix epoch form converted into a human-readable timestamp, timezones included.
+
+ Formerly a feature from SkyBlockCatia, then later attempted to be ported into Skytils.
+ Now has a comfy home in the NotEnoughUpdates codebase.
*/
@NEUAutoSubscribe
class CountdownCalculator {
- val regex =
- "(?:(?<days>\\d+)d)? ?(?:(?<hours>\\d+)h)? ?(?:(?<minutes>\\d+)m)? ?(?:(?<seconds>\\d+)s)?\\b".toRegex()
- val formatter12h = DateTimeFormatter.ofPattern("EEEE, MMM d h:mm a")!!
- val formatter24h = DateTimeFormatter.ofPattern("EEEE, MMM d HH:mm")!!
+ private val regex =
+ "(?:(?<years>\\d+)y )?(?:(?<days>\\d+)d)? ?(?:(?<hours>\\d+)h)? ?(?:(?<minutes>\\d+)m)? ?(?:(?<seconds>\\d+)s)?\\b".toRegex()
@Suppress("unused")
private enum class CountdownTypes(
@@ -64,14 +62,14 @@ class CountdownCalculator {
TIMELEFT("Time left:", "Ends at"),
EVENTTIMELEFT("Event lasts for", "Ends at", isRelative = true),
SHENSUCKS("Auction ends in:", "Auction ends at"),
- CALENDARDETAILS("(§e", "Starts at"); // Calendar details
+ CALENDARDETAILS(" (§e", "Starts at"); // Calendar details
}
@SubscribeEvent
fun onTooltip(event: ItemTooltipEvent) {
- val useFormatter = when (NotEnoughUpdates.INSTANCE.config.misc.showWhenCountdownEnds) {
- 1 -> formatter12h
- 2 -> formatter24h
+ var formatterAsString = when (NotEnoughUpdates.INSTANCE.config.misc.showWhenCountdownEnds) {
+ 1 -> "EEEE, MMM d h:mm a"
+ 2 -> "EEEE, MMM d HH:mm"
else -> return
}
if (event.itemStack != null && Minecraft.getMinecraft().thePlayer?.openContainer != null) {
@@ -82,12 +80,15 @@ class CountdownCalculator {
val countdownKind = CountdownTypes.values().find { it.match in tooltipLine } ?: continue
val match = regex.findAll(tooltipLine).maxByOrNull { it.value.length } ?: continue
+ val years = match.groups["years"]?.value?.toInt() ?: 0
val days = match.groups["days"]?.value?.toInt() ?: 0
val hours = match.groups["hours"]?.value?.toInt() ?: 0
val minutes = match.groups["minutes"]?.value?.toInt() ?: 0
val seconds = match.groups["seconds"]?.value?.toInt() ?: 0
- val totalSeconds = days * 86400L + hours * 3600L + minutes * 60L + seconds
+ val totalSeconds = (years * 31_536_000L) + (days * 86_400L) + (hours * 3_600L) + (minutes * 60L) + seconds
if (totalSeconds == 0L) continue
+ if (years != 0) formatterAsString = "${formatterAsString} yyyy"
+ val useFormatter = DateTimeFormatter.ofPattern(formatterAsString)!!
val countdownTarget = if (countdownKind.isRelative) {
if (lastTimer == null) {
event.toolTip.add(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt
index ea01eb2e..ea01eb2e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/WardrobeMouseButtons.kt
generated by cgit (git 2.46.0) at 2024-11-21 19:03:08 +0000