Spiders den rain notifications #1069
Open
+100
−24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AzureAaron
added
the
merge conflicts
| @@ -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()); | |||
There was a problem hiding this comment.
I don't think you need an atomic reference here. A non-final field will do.
Comment on lines
+85
to
+91
| private static void register() { | ||
| if (initialized) { | ||
| return; | ||
| } | ||
| Scheduler.INSTANCE.scheduleCyclic(EventNotifications::refreshEvents, 20 * (int) EVENTS_UPDATE_PERIOD.toSeconds()); | ||
| initialized = true; | ||
| } |
There was a problem hiding this comment.
This is more complicated than necessary. Just put this in init().
Comment on lines
+129
to
+134
| 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; |
There was a problem hiding this comment.
I would put this above getEvents.
Comment on lines
+169
to
+180
| 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))); | ||
| }); | ||
| } |
There was a problem hiding this comment.
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.
| 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))); |
There was a problem hiding this comment.
Don't think we need linkedlist.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implementation of #1068. Could not find the code for
/api/calendarendpoint, so I added calculation to the mod itself, since the logic is quite simple. Also the API seems to return only old events now and I can't test that patch does not break existing code :(