From da68e9a162645c90e0ae816f178f25819b81652f Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 10 Sep 2023 19:01:57 -0400 Subject: Add SchedulerTest --- src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index 76112e0d..cf285316 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -51,7 +51,7 @@ public class Scheduler { if (period <= 0) { LOGGER.error("Attempted to schedule a cyclic task with period lower than 1"); } else { - new CyclicTask(task, period).run(); + schedule(new CyclicTask(this, task, period), 0); } } @@ -95,10 +95,10 @@ public class Scheduler { * @param inner the task to run * @param period the period in ticks */ - protected record CyclicTask(Runnable inner, int period) implements Runnable { + protected record CyclicTask(Scheduler scheduler, Runnable inner, int period) implements Runnable { @Override public void run() { - SkyblockerMod.getInstance().scheduler.schedule(this, period); + scheduler.schedule(this, period); inner.run(); } } -- cgit From 659b73aefd8d9f5d7e60c4d222b7934121703df1 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 10 Sep 2023 20:53:07 -0400 Subject: Remove ScheduledTask allocations --- .../skyblocker/utils/scheduler/Scheduler.java | 37 ++++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index cf285316..3f578899 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -37,8 +37,7 @@ public class Scheduler { if (delay < 0) { LOGGER.warn("Scheduled a task with negative delay"); } - ScheduledTask tmp = new ScheduledTask(task, currentTick + delay); - tasks.add(tmp); + tasks.add(new ScheduledTask(task, currentTick + delay)); } /** @@ -51,7 +50,7 @@ public class Scheduler { if (period <= 0) { LOGGER.error("Attempted to schedule a cyclic task with period lower than 1"); } else { - schedule(new CyclicTask(this, task, period), 0); + tasks.add(new CyclicTask(this, task, period)); } } @@ -75,6 +74,7 @@ public class Scheduler { ScheduledTask task; while ((task = tasks.peek()) != null && task.schedule <= currentTick && runTask(task)) { tasks.poll(); + if (task instanceof CyclicTask) tasks.add(task); } } @@ -91,25 +91,36 @@ public class Scheduler { /** * A task that runs every period ticks. More specifically, this task reschedules itself to run again after period ticks every time it runs. - * - * @param inner the task to run - * @param period the period in ticks */ - protected record CyclicTask(Scheduler scheduler, Runnable inner, int period) implements Runnable { + protected static class CyclicTask extends ScheduledTask { + private final Scheduler scheduler; + private final int period; + + CyclicTask(Scheduler scheduler, Runnable inner, int period) { + super(inner, scheduler.currentTick); + this.scheduler = scheduler; + this.period = period; + } + @Override public void run() { - scheduler.schedule(this, period); - inner.run(); + super.run(); + schedule = scheduler.currentTick + period; } } /** * A task that runs at a specific tick, relative to {@link #currentTick}. - * - * @param inner the task to run - * @param schedule the tick to run at */ - protected record ScheduledTask(Runnable inner, int schedule) implements Comparable, Runnable { + protected static class ScheduledTask implements Comparable, Runnable { + private final Runnable inner; + protected int schedule; + + public ScheduledTask(Runnable inner, int schedule) { + this.inner = inner; + this.schedule = schedule; + } + @Override public int compareTo(ScheduledTask o) { return schedule - o.schedule; -- cgit From b81599c5f82e347b7709d538376fc895d77ba501 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 10 Sep 2023 22:23:56 -0400 Subject: Use AVLTreeMap --- .../skyblocker/utils/scheduler/Scheduler.java | 54 ++++++++++++++-------- 1 file changed, 34 insertions(+), 20 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index 3f578899..1d61edd3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -1,6 +1,10 @@ package me.xmrvizzy.skyblocker.utils.scheduler; import com.mojang.brigadier.Command; +import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import me.xmrvizzy.skyblocker.SkyblockerMod; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; @@ -8,7 +12,8 @@ import net.minecraft.client.gui.screen.Screen; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.PriorityQueue; +import java.util.ArrayList; +import java.util.List; import java.util.function.Supplier; /** @@ -17,7 +22,7 @@ import java.util.function.Supplier; public class Scheduler { private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); private int currentTick = 0; - private final PriorityQueue tasks = new PriorityQueue<>(); + private final AbstractInt2ObjectSortedMap> tasks = new Int2ObjectAVLTreeMap<>(); /** * Do not instantiate this class. Use {@link SkyblockerMod#scheduler} instead. @@ -37,7 +42,7 @@ public class Scheduler { if (delay < 0) { LOGGER.warn("Scheduled a task with negative delay"); } - tasks.add(new ScheduledTask(task, currentTick + delay)); + tasks.computeIfAbsent(currentTick + delay, key -> new ArrayList<>()).add(new ScheduledTask(task)); } /** @@ -50,7 +55,7 @@ public class Scheduler { if (period <= 0) { LOGGER.error("Attempted to schedule a cyclic task with period lower than 1"); } else { - tasks.add(new CyclicTask(this, task, period)); + tasks.computeIfAbsent(currentTick, key -> new ArrayList<>()).add(new CyclicTask(this, task, period)); } } @@ -71,10 +76,26 @@ public class Scheduler { public void tick() { currentTick += 1; - ScheduledTask task; - while ((task = tasks.peek()) != null && task.schedule <= currentTick && runTask(task)) { - tasks.poll(); - if (task instanceof CyclicTask) tasks.add(task); + if (tasks.containsKey(currentTick - 1)) { + List currentTickTasks = tasks.get(currentTick - 1); + for (int i = 0; i < currentTickTasks.size(); i++) { + ScheduledTask task = currentTickTasks.get(i); + if (!runTask(task)) { + tasks.computeIfAbsent(currentTick + 1, key -> new ArrayList<>()).add(task); + } + } + tasks.remove(currentTick - 1); + } + + if (tasks.containsKey(currentTick)) { + List currentTickTasks = tasks.get(currentTick); + for (int i = 0; i < currentTickTasks.size(); i++) { + ScheduledTask task = currentTickTasks.get(i); + if (!runTask(task)) { + tasks.computeIfAbsent(currentTick + 1, key -> new ArrayList<>()).add(task); + } + } + tasks.remove(currentTick); } } @@ -92,12 +113,12 @@ public class Scheduler { /** * A task that runs every period ticks. More specifically, this task reschedules itself to run again after period ticks every time it runs. */ - protected static class CyclicTask extends ScheduledTask { + protected class CyclicTask extends ScheduledTask { private final Scheduler scheduler; private final int period; CyclicTask(Scheduler scheduler, Runnable inner, int period) { - super(inner, scheduler.currentTick); + super(inner); this.scheduler = scheduler; this.period = period; } @@ -105,25 +126,18 @@ public class Scheduler { @Override public void run() { super.run(); - schedule = scheduler.currentTick + period; + tasks.computeIfAbsent(scheduler.currentTick + period, key -> new ArrayList<>()).add(this); } } /** * A task that runs at a specific tick, relative to {@link #currentTick}. */ - protected static class ScheduledTask implements Comparable, Runnable { + protected static class ScheduledTask implements Runnable { private final Runnable inner; - protected int schedule; - public ScheduledTask(Runnable inner, int schedule) { + public ScheduledTask(Runnable inner) { this.inner = inner; - this.schedule = schedule; - } - - @Override - public int compareTo(ScheduledTask o) { - return schedule - o.schedule; } @Override -- cgit From 44904d03f992b46b96ecc7283d054e7b92b7fe50 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 10 Sep 2023 23:35:26 -0400 Subject: Optimize Scheduler --- .../xmrvizzy/skyblocker/utils/scheduler/Scheduler.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index 1d61edd3..1bc8829b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -2,9 +2,7 @@ package me.xmrvizzy.skyblocker.utils.scheduler; import com.mojang.brigadier.Command; import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap; import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import me.xmrvizzy.skyblocker.SkyblockerMod; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; @@ -22,7 +20,7 @@ import java.util.function.Supplier; public class Scheduler { private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); private int currentTick = 0; - private final AbstractInt2ObjectSortedMap> tasks = new Int2ObjectAVLTreeMap<>(); + private final AbstractInt2ObjectSortedMap> tasks = new Int2ObjectLinkedOpenHashMap<>(); /** * Do not instantiate this class. Use {@link SkyblockerMod#scheduler} instead. @@ -75,20 +73,9 @@ public class Scheduler { } public void tick() { - currentTick += 1; - if (tasks.containsKey(currentTick - 1)) { - List currentTickTasks = tasks.get(currentTick - 1); - for (int i = 0; i < currentTickTasks.size(); i++) { - ScheduledTask task = currentTickTasks.get(i); - if (!runTask(task)) { - tasks.computeIfAbsent(currentTick + 1, key -> new ArrayList<>()).add(task); - } - } - tasks.remove(currentTick - 1); - } - if (tasks.containsKey(currentTick)) { List currentTickTasks = tasks.get(currentTick); + //noinspection ForLoopReplaceableByForEach (or else we get a ConcurrentModificationException) for (int i = 0; i < currentTickTasks.size(); i++) { ScheduledTask task = currentTickTasks.get(i); if (!runTask(task)) { @@ -97,6 +84,7 @@ public class Scheduler { } tasks.remove(currentTick); } + currentTick += 1; } /** -- cgit From a99e3f21b31d6b9cfc28d207b4bed51c525dab12 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:06:04 -0400 Subject: Switch to HashMap --- .../skyblocker/utils/scheduler/Scheduler.java | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index 1bc8829b..e3b590c7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.utils.scheduler; import com.mojang.brigadier.Command; -import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import me.xmrvizzy.skyblocker.SkyblockerMod; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; @@ -20,7 +20,7 @@ import java.util.function.Supplier; public class Scheduler { private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); private int currentTick = 0; - private final AbstractInt2ObjectSortedMap> tasks = new Int2ObjectLinkedOpenHashMap<>(); + private final AbstractInt2ObjectMap> tasks = new Int2ObjectOpenHashMap<>(); /** * Do not instantiate this class. Use {@link SkyblockerMod#scheduler} instead. @@ -37,10 +37,11 @@ public class Scheduler { * @param delay the delay in ticks */ public void schedule(Runnable task, int delay) { - if (delay < 0) { + if (delay >= 0) { + addTask(new ScheduledTask(task), currentTick + delay); + } else { LOGGER.warn("Scheduled a task with negative delay"); } - tasks.computeIfAbsent(currentTick + delay, key -> new ArrayList<>()).add(new ScheduledTask(task)); } /** @@ -50,10 +51,10 @@ public class Scheduler { * @param period the period in ticks */ public void scheduleCyclic(Runnable task, int period) { - if (period <= 0) { - LOGGER.error("Attempted to schedule a cyclic task with period lower than 1"); + if (period > 0) { + addTask(new CyclicTask(task, period), currentTick); } else { - tasks.computeIfAbsent(currentTick, key -> new ArrayList<>()).add(new CyclicTask(this, task, period)); + LOGGER.error("Attempted to schedule a cyclic task with period lower than 1"); } } @@ -98,23 +99,31 @@ public class Scheduler { return true; } + private void addTask(ScheduledTask scheduledTask, int schedule) { + if (tasks.containsKey(schedule)) { + tasks.get(schedule).add(scheduledTask); + } else { + List list = new ArrayList<>(); + list.add(scheduledTask); + tasks.put(schedule, list); + } + } + /** * A task that runs every period ticks. More specifically, this task reschedules itself to run again after period ticks every time it runs. */ protected class CyclicTask extends ScheduledTask { - private final Scheduler scheduler; private final int period; - CyclicTask(Scheduler scheduler, Runnable inner, int period) { + CyclicTask(Runnable inner, int period) { super(inner); - this.scheduler = scheduler; this.period = period; } @Override public void run() { super.run(); - tasks.computeIfAbsent(scheduler.currentTick + period, key -> new ArrayList<>()).add(this); + addTask(this, currentTick + period); } } -- cgit From 059385f9dd070beae77a77bebae34f0ca06b664a Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:57:08 -0400 Subject: Make Scheduler and MessageScheduler singletons --- src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 4 ++-- .../skyblocker/utils/render/title/TitleContainer.java | 3 +-- .../skyblocker/utils/scheduler/MessageScheduler.java | 7 +++++-- .../me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java | 13 ++++--------- 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 1e8e7ffa..149004c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -2,9 +2,9 @@ package me.xmrvizzy.skyblocker.utils; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; import me.xmrvizzy.skyblocker.skyblock.rift.TheRift; +import me.xmrvizzy.skyblocker.utils.scheduler.MessageScheduler; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; @@ -294,7 +294,7 @@ public class Utils { if (isOnSkyblock) { long currentTime = System.currentTimeMillis(); if (!sentLocRaw && currentTime > clientWorldJoinTime + 1000 && currentTime > lastLocRaw + 15000) { - SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown("/locraw"); + MessageScheduler.INSTANCE.sendMessageAfterCooldown("/locraw"); sentLocRaw = true; lastLocRaw = currentTime; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainer.java b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainer.java index 6e15c871..2555572c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainer.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainer.java @@ -1,6 +1,5 @@ package me.xmrvizzy.skyblocker.utils.render.title; -import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; @@ -66,7 +65,7 @@ public class TitleContainer { */ public static boolean addTitle(Title title, int ticks) { if (addTitle(title)) { - SkyblockerMod.getInstance().scheduler.schedule(() -> TitleContainer.removeTitle(title), ticks); + Scheduler.INSTANCE.schedule(() -> TitleContainer.removeTitle(title), ticks); return true; } return false; diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/MessageScheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/MessageScheduler.java index bde29c13..b8ffa548 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/MessageScheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/MessageScheduler.java @@ -3,19 +3,22 @@ package me.xmrvizzy.skyblocker.utils.scheduler; import net.minecraft.client.MinecraftClient; /** - * A scheduler for sending chat messages or commands. Use the instance in {@link me.xmrvizzy.skyblocker.SkyblockerMod#messageScheduler SkyblockerMod.messageScheduler}. Do not instantiate this class. + * A scheduler for sending chat messages or commands. Use the instance in {@link #INSTANCE}. Do not instantiate this class. */ -@SuppressWarnings("deprecation") public class MessageScheduler extends Scheduler { /** * The minimum delay that the server will accept between chat messages. */ private static final int MIN_DELAY = 200; + public static final MessageScheduler INSTANCE = new MessageScheduler(); /** * The timestamp of the last message send, */ private long lastMessage = 0; + protected MessageScheduler() { + } + /** * Sends a chat message or command after the minimum cooldown. Prefer this method to send messages or commands to the server. * diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java index e3b590c7..700bdce3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java @@ -3,7 +3,6 @@ package me.xmrvizzy.skyblocker.utils.scheduler; import com.mojang.brigadier.Command; import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import me.xmrvizzy.skyblocker.SkyblockerMod; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; @@ -15,19 +14,15 @@ import java.util.List; import java.util.function.Supplier; /** - * A scheduler for running tasks at a later time. Tasks will be run synchronously on the main client thread. Use the instance stored in {@link SkyblockerMod#scheduler}. Do not instantiate this class. + * A scheduler for running tasks at a later time. Tasks will be run synchronously on the main client thread. Use the instance stored in {@link #INSTANCE}. Do not instantiate this class. */ public class Scheduler { private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); + public static final Scheduler INSTANCE = new Scheduler(); private int currentTick = 0; private final AbstractInt2ObjectMap> tasks = new Int2ObjectOpenHashMap<>(); - /** - * Do not instantiate this class. Use {@link SkyblockerMod#scheduler} instead. - */ - @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - public Scheduler() { + protected Scheduler() { } /** @@ -59,7 +54,7 @@ public class Scheduler { } public static Command queueOpenScreenCommand(Supplier screenSupplier) { - return context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(screenSupplier); + return context -> INSTANCE.queueOpenScreen(screenSupplier); } /** -- cgit