Skip to content

Spiders den rain notifications #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Spiders den rain notifications #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d549beb
Add optional notifications for Spider's Den rain and thunderstorm
darkkeks Dec 7, 2024
52ad968
fix: Comment out debug logging
darkkeks Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private static List<OptionGroup> createGroups(SkyblockerConfig config) {
for (Map.Entry<String, IntList> entry : eventsReminderTimes.entrySet()) {
groups.add(ListOption.<Integer>createBuilder()
.name(Text.literal(entry.getKey()))
.binding(EventNotifications.DEFAULT_REMINDERS, entry::getValue, integers -> entry.setValue(new IntImmutableList(integers)))
.binding(EventNotifications.getDefaultReminders(entry.getKey()), entry::getValue, integers -> entry.setValue(new IntImmutableList(integers)))
.controller(option -> () -> new DurationController(option)) // yea
.description(OptionDescription.of(Text.translatable("skyblocker.config.eventNotifications.@Tooltip[0]"),
Text.empty(),
Expand Down
119 changes: 97 additions & 22 deletions src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.events.SkyblockEvents;
import de.hysky.skyblocker.utils.Http;
import de.hysky.skyblocker.utils.SkyblockTime;
import de.hysky.skyblocker.utils.Utils;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
import it.unimi.dsi.fastutil.ints.IntList;
Expand All @@ -24,21 +25,46 @@
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;

import java.time.Duration;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.stream.LongStream;

public class EventNotifications {
private static final Logger LOGGER = LogUtils.getLogger();

private static long currentTime = System.currentTimeMillis() / 1000;

public static final String JACOBS = "Jacob's Farming Contest";
private static final String SPIDERS_DEN_RAIN = "Spider's Den Rain";
private static final String SPIDERS_DEN_THUNDERSTORM = "Spider's Den Thunderstorm";

public static final IntList DEFAULT_REMINDERS = IntList.of(60, 60 * 5);
private static final IntList DEFAULT_REMINDERS = IntList.of(60, 60 * 5);

private static boolean initialized = false;
private static final Duration EVENTS_UPDATE_PERIOD = Duration.ofHours(1);

private static final List<SkyblockPeriodicEvent> PERIODIC_EVENTS = List.of(
new SkyblockPeriodicEvent(
SPIDERS_DEN_RAIN,
40 * 60,
60 * 60,
20 * 60,
"/warp spiders",
IntList.of()),
new SkyblockPeriodicEvent(
SPIDERS_DEN_THUNDERSTORM,
40 * 60,
3 * 60 * 60,
20 * 60,
"/warp spiders",
IntList.of())
);

public static final Map<String, ItemStack> eventIcons = Map.ofEntries(
Map.entry("Dark Auction", new ItemStack(Items.NETHER_BRICK)),
Expand All @@ -51,14 +77,23 @@ public class EventNotifications {
Map.entry("Spooky Festival", new ItemStack(Items.JACK_O_LANTERN)),
Map.entry("Season of Jerry", new ItemStack(Items.SNOWBALL)),
Map.entry("Jerry's Workshop Opens", new ItemStack(Items.SNOW_BLOCK)),
Map.entry(SPIDERS_DEN_RAIN, new ItemStack(Items.FISHING_ROD)),
Map.entry(SPIDERS_DEN_THUNDERSTORM, new ItemStack(Items.FISHING_ROD)),
Map.entry("Traveling Zoo", new ItemStack(Items.HAY_BLOCK)) // change to the custom head one day
);

private static void register() {
if (initialized) {
return;
}
Scheduler.INSTANCE.scheduleCyclic(EventNotifications::refreshEvents, 20 * (int) EVENTS_UPDATE_PERIOD.toSeconds());
initialized = true;
}
Comment on lines +85 to +91
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is more complicated than necessary. Just put this in init().


@Init
public static void init() {
Scheduler.INSTANCE.scheduleCyclic(EventNotifications::timeUpdate, 20);

SkyblockEvents.JOIN.register(EventNotifications::refreshEvents);
SkyblockEvents.JOIN.register(EventNotifications::register);
ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(
ClientCommandManager.literal("skyblocker").then(
ClientCommandManager.literal("debug").then(
Expand All @@ -85,10 +120,18 @@ public static void init() {
));
}

private static final Map<String, LinkedList<SkyblockEvent>> events = new ConcurrentHashMap<>();
private static final AtomicReference<Map<String, LinkedList<SkyblockEvent>>> events = new AtomicReference<>(Map.of());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need an atomic reference here. A non-final field will do.


public static Map<String, LinkedList<SkyblockEvent>> getEvents() {
return events;
return events.get();
}

public static IntList getDefaultReminders(String eventName) {
var periodicEvent = PERIODIC_EVENTS.stream().filter(event -> event.name.equals(eventName)).findFirst();
if (periodicEvent.isPresent()) {
return periodicEvent.get().defaultReminders();
}
return DEFAULT_REMINDERS;
Comment on lines +129 to +134
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would put this above getEvents.

}

public static void refreshEvents() {
Expand All @@ -100,35 +143,50 @@ public static void refreshEvents() {
LOGGER.error("[Skyblocker] Failed to download events list", e);
}
return List.<JsonObject>of();
}).thenAccept(eventsList -> {
events.clear();
for (JsonObject object : eventsList) {
if (object.get("timestamp").getAsLong() + object.get("duration").getAsInt() < currentTime) continue;
SkyblockEvent skyblockEvent = SkyblockEvent.of(object);
events.computeIfAbsent(object.get("event").getAsString(), s -> new LinkedList<>()).add(skyblockEvent);
}
})
.thenAccept(objects -> {
long nowSeconds = System.currentTimeMillis() / 1000;
Map<String, LinkedList<SkyblockEvent>> newEvents = objects.stream()
.map(SkyblockEvent::of)
.filter(event -> event.start + event.duration >= nowSeconds)
.collect(Collectors.groupingBy(SkyblockEvent::name, Collectors.toCollection(LinkedList::new)));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think we need linkedlist.


addFixedEvents(nowSeconds, newEvents);

for (Map.Entry<String, LinkedList<SkyblockEvent>> entry : events.entrySet()) {
for (Map.Entry<String, LinkedList<SkyblockEvent>> entry : newEvents.entrySet()) {
entry.getValue().sort(Comparator.comparingLong(SkyblockEvent::start)); // Sort just in case it's not in order for some reason in API
//LOGGER.info("Next {} is at {}", entry.getKey(), entry.getValue().peekFirst());
}

for (String s : events.keySet()) {
SkyblockerConfigManager.get().eventNotifications.eventsReminderTimes.computeIfAbsent(s, s1 -> DEFAULT_REMINDERS);
for (String s : newEvents.keySet()) {
SkyblockerConfigManager.get().eventNotifications.eventsReminderTimes.computeIfAbsent(s, EventNotifications::getDefaultReminders);
}

events.set(newEvents);
}).exceptionally(EventNotifications::itBorked);
}

private static void addFixedEvents(long nowSeconds, Map<String, LinkedList<SkyblockEvent>> events) {
PERIODIC_EVENTS.forEach(event -> {
long firstEvent = SkyblockTime.SKYBLOCK_EPOCH / 1000 + event.offsetFromSkyblockEpochSeconds;
long currentEvent = firstEvent + (nowSeconds - firstEvent + event.periodSeconds - 1) / event.periodSeconds * event.periodSeconds;
// Prepare events for next two update periods in case one is skipped for some reason, or at least one if event is rare.
long eventsToAdd = Math.max(1, 2 * EVENTS_UPDATE_PERIOD.toSeconds() / event.periodSeconds);
events.put(event.name, LongStream.range(0, eventsToAdd)
.map(i -> currentEvent + i * event.periodSeconds)
.mapToObj(ts -> new SkyblockEvent(event.name, ts, event.durationSeconds, new String[0], event.warpCommand))
.collect(Collectors.toCollection(LinkedList::new)));
});
}
Comment on lines +169 to +180
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lambda (passed into forEach) could be turned into a method in SkyblockerPeriodicEvent. Also, please add some javadoc for what this method does, as the name add could be unclear.


private static Void itBorked(Throwable throwable) {
LOGGER.error("[Skyblocker] Event loading borked, sowwy :(", throwable);
return null;
}


private static void timeUpdate() {

long newTime = System.currentTimeMillis() / 1000;
for (Map.Entry<String, LinkedList<SkyblockEvent>> entry : events.entrySet()) {
for (Map.Entry<String, LinkedList<SkyblockEvent>> entry : getEvents().entrySet()) {
LinkedList<SkyblockEvent> nextEvents = entry.getValue();
SkyblockEvent skyblockEvent = nextEvents.peekFirst();
if (skyblockEvent == null) continue;
Expand All @@ -141,7 +199,7 @@ private static void timeUpdate() {
}
String eventName = entry.getKey();
// Cannot be changed to fast util due to casting issues
List<Integer> reminderTimes = SkyblockerConfigManager.get().eventNotifications.eventsReminderTimes.getOrDefault(eventName, DEFAULT_REMINDERS);
List<Integer> reminderTimes = SkyblockerConfigManager.get().eventNotifications.eventsReminderTimes.getOrDefault(eventName, getDefaultReminders(eventName));
if (reminderTimes.isEmpty()) continue;

for (int reminderTime : reminderTimes) {
Expand Down Expand Up @@ -175,14 +233,31 @@ private static boolean criterionMet() {
};
}

public record SkyblockEvent(long start, int duration, String[] extras, @Nullable String warpCommand) {
public record SkyblockEvent(
String name,
long start,
int duration,
String[] extras,
@Nullable String warpCommand
) {
public static SkyblockEvent of(JsonObject jsonObject) {
String location = jsonObject.get("location").getAsString();
location = location.isBlank() ? null : location;
return new SkyblockEvent(jsonObject.get("timestamp").getAsLong(),
return new SkyblockEvent(
jsonObject.get("event").getAsString(),
jsonObject.get("timestamp").getAsLong(),
jsonObject.get("duration").getAsInt(),
jsonObject.get("extras").getAsJsonArray().asList().stream().map(JsonElement::getAsString).toArray(String[]::new),
location);
}
}

private record SkyblockPeriodicEvent(
String name,
long offsetFromSkyblockEpochSeconds,
int periodSeconds,
int durationSeconds,
@Nullable String warpCommand,
IntList defaultReminders
) {}
}
3 changes: 2 additions & 1 deletion src/main/java/de/hysky/skyblocker/utils/SkyblockTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
import java.util.concurrent.atomic.AtomicReference;

public class SkyblockTime {
private static final long SKYBLOCK_EPOCH = 1560275700000L;
// https://wiki.hypixel.net/SkyBlock_Time
public static final long SKYBLOCK_EPOCH = 1560275700000L;
public static final AtomicInteger skyblockYear = new AtomicInteger(0);
public static final AtomicReference<Season> skyblockSeason = new AtomicReference<>(Season.SPRING);
public static final AtomicReference<Month> skyblockMonth = new AtomicReference<>(Month.EARLY_SPRING);
Expand Down
Loading