From 02391e281611a8389cc983704ec521501219aad5 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:41:44 -0400
Subject: [PATCH 01/16] proof of concept

---
 .../base/SimplePropertyExpression.java        |  19 ++-
 .../skript/lang/errors/RuntimeError.java      |  17 +++
 .../lang/errors/RuntimeErrorProducer.java     | 135 ++++++++++++++++++
 3 files changed, 170 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java
 create mode 100644 src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java

diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index dbbf968f9df..90071bdef6d 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -1,12 +1,14 @@
 package ch.njol.skript.expressions.base;
 
 import ch.njol.skript.classes.Converter;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.errors.RuntimeErrorProducer;
 
 /**
  * A base class for property expressions that requires only few overridden methods
@@ -15,7 +17,10 @@
  * @see PropertyExpression#register(Class, Class, String, String)
  */
 @SuppressWarnings("deprecation") // for backwards compatibility
-public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T> {
+public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T>, RuntimeErrorProducer {
+
+	private Node node;
+	private String rawExpr;
 
 	@Override
 	@SuppressWarnings("unchecked")
@@ -25,6 +30,8 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 			return LiteralUtils.canInitSafely(getExpr());
 		}
 		setExpr((Expression<? extends F>) expressions[0]);
+		node = getParser().getNode();
+		rawExpr = parseResult.expr;
 		return true;
 	}
 
@@ -37,6 +44,16 @@ protected T[] get(Event event, F[] source) {
 		return super.get(source, this);
 	}
 
+	@Override
+	public Node getNode() {
+		return node;
+	}
+
+	@Override
+	public String toUnderline() {
+		return rawExpr;
+	}
+
 	/**
 	 * Used to collect the property type used in the register method.
 	 * This forms the toString of this SimplePropertyExpression.
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java
new file mode 100644
index 00000000000..b83f8bf2a81
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java
@@ -0,0 +1,17 @@
+package org.skriptlang.skript.lang.errors;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.log.LogEntry;
+import ch.njol.skript.log.LogHandler;
+import ch.njol.skript.log.SkriptLogger;
+
+import java.util.logging.Level;
+
+public record RuntimeError(Level level, String message, Node node) {
+
+	public void log(LogHandler log) {
+		SkriptLogger.log(new LogEntry(level, message, node));
+	}
+
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
new file mode 100644
index 00000000000..a4da0a74f6a
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -0,0 +1,135 @@
+package org.skriptlang.skript.lang.errors;
+
+import ch.njol.skript.config.Config;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.Section;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Utils;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.lang.structure.Structure;
+
+import java.util.logging.Level;
+
+/**
+ * A RuntimeErrorProducer can throw runtime errors in a standardized and controlled manner.
+ * Only {@link SyntaxElement}s are intended to implement this interface.
+ */
+public interface RuntimeErrorProducer {
+
+	// todo: try/catch
+
+	/**
+	 * Returns the {@link Node} that this is a part of. Used for accessing the line contents via {@link Node#getKey()}
+	 * and the line number via {@link Node#getLine()}.
+	 * <br>
+	 * A standard implementation is to store the Node during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
+	 * via {@link ParserInstance#getNode()}.
+	 * @return The node that produced a runtime error.
+	 */
+	Node getNode();
+
+	/**
+	 * Gets the text that should be underlined within the line contents. This should match the text the user wrote that
+	 * was parsed as the syntax that threw the runtime issue. For example, if the skull expression in
+	 * {@code give skull of player to all players} throws a runtime error, this method should return
+	 * {@code "skull of player"}
+	 * <br>
+	 * An example implementation for {@link Expression}s is to store {@link SkriptParser.ParseResult#expr} during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)} and return that.
+	 * <br>
+	 * For other syntax types, this may vary. Effects, for example, may underline the whole line.
+	 *
+	 * @return The text to underline in the line that produced a runtime error.
+	 */
+	String toUnderline();
+
+	/**
+	 * Dispatches a runtime error with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void error(String message) {
+		String formatted = toFormattedString(Level.SEVERE, message, getNode(), toUnderline());
+		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
+		// todo: check if error should be suppressed, set last error field for users
+		// todo: send notif to online players with permission. "Script x.sk produced a runtime error! Check console."
+	}
+
+	/**
+	 * Dispatches a runtime warning with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void warning(String message) {
+		String formatted = toFormattedString(Level.WARNING, message, getNode(), toUnderline());
+		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
+		// todo: check if error should be suppressed, set last error field for users
+		// todo: send notif to online players with permission. "Script x.sk produced a runtime warning! Check console."
+	}
+
+	/**
+	 * Generates a formatted string based on the provided log level, message, node information, and text to underline.
+	 *
+	 * @param level The severity level of the log message.
+	 * @param message The message to be included in the log.
+	 * @param node The node associated with this log message.
+	 * @param toUnderline The text in the node's line content that should be underlined in the log message.
+	 * @return A formatted string that includes metadata such as the script filename, error message,
+	 * 			and the specific line that caused the error.
+	 */
+	default String toFormattedString(Level level, String message, Node node, String toUnderline) {
+		// Replace configured messages chat styles without user variables
+		// todo: add lang entries, handle error vs warning
+		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles("<light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s:\n"));
+		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<light red>%s<reset>\n"));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<gold>Line %s<white>: <gray>%s\n"));
+
+		if (node == null)
+			return "handle null nodes";
+
+		Config c = node.getConfig();
+		String from = this.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
+
+		return
+			String.format(skriptInfo, c.getFileName(), from, getSyntaxType()) +
+			String.format(errorInfo, message.replaceAll("§", "&")) +
+			String.format(lineInfo, node.getLine(), node.save().trim().replaceAll("§", "&").replaceAll(toUnderline, "§f§n" + toUnderline + "§7"));
+	}
+
+	@Contract(pure = true)
+	private @NotNull String getSyntaxType() {
+		if (this instanceof Effect) {
+			return "effect";
+		} else if (this instanceof Condition) {
+			return "condition";
+		} else if (this instanceof Expression<?>) {
+			return "expression";
+		} else if (this instanceof Section) {
+			return "section";
+		} else if (this instanceof Structure) {
+			return "structure";
+		}
+		return "syntax";
+	}
+
+	@Contract(pure = true)
+	private @NotNull String replaceNewline(@NotNull String s) {
+		return s.replaceAll("\\\\n", "\n");
+	}
+
+}

From dbdf666ef28dc2b486f290e4ff2286143edbc314 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:45:58 -0400
Subject: [PATCH 02/16] Delete RuntimeError.java

---
 .../skript/lang/errors/RuntimeError.java        | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java

diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java
deleted file mode 100644
index b83f8bf2a81..00000000000
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeError.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.skriptlang.skript.lang.errors;
-
-import ch.njol.skript.config.Node;
-import ch.njol.skript.log.LogEntry;
-import ch.njol.skript.log.LogHandler;
-import ch.njol.skript.log.SkriptLogger;
-
-import java.util.logging.Level;
-
-public record RuntimeError(Level level, String message, Node node) {
-
-	public void log(LogHandler log) {
-		SkriptLogger.log(new LogEntry(level, message, node));
-	}
-
-
-}

From 729ab9866335d664753356ab3919206382f000c2 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:31:52 -0500
Subject: [PATCH 03/16] prototype limits

---
 .../java/ch/njol/skript/ScriptLoader.java     |   4 +
 .../skript/expressions/ExprSkullOwner.java    |   5 +-
 .../lang/errors/RuntimeErrorManager.java      | 107 ++++++++++++++++++
 .../lang/errors/RuntimeErrorProducer.java     |   9 +-
 4 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 9d246d9565e..b69d01deee4 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -47,6 +47,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.errors.RuntimeErrorProducer;
 import org.skriptlang.skript.util.event.EventRegistry;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.script.ScriptWarning;
@@ -887,6 +888,9 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		// finish unloading + data collection
 		ScriptInfo info = new ScriptInfo();
 		for (Script script : scripts) {
+			// clear nodes from runtime error tracking
+			RuntimeErrorProducer.ERROR_MANAGER.unlockNodes(script);
+
 			List<Structure> structures = script.getStructures();
 
 			info.files++;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
index bc102126022..754d6b65baf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
@@ -7,6 +7,7 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.registrations.Classes;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -32,8 +33,10 @@ public class ExprSkullOwner extends SimplePropertyExpression<Block, OfflinePlaye
 	@Override
 	public @Nullable OfflinePlayer convert(Block block) {
 		BlockState state = block.getState();
-		if (!(state instanceof Skull))
+		if (!(state instanceof Skull)) {
+			error("Block '" + Classes.toString(block) + "' is not a skull!");
 			return null;
+		}
 		return ((Skull) state).getOwningPlayer();
 	}
 
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
new file mode 100644
index 00000000000..9cce1f8f591
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
@@ -0,0 +1,107 @@
+package org.skriptlang.skript.lang.errors;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Utils;
+import org.bukkit.Bukkit;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Handles duplicate and spammed runtime errors.
+ */
+public class RuntimeErrorManager {
+
+	/*
+	a) route all errors through here
+	b) handle formatting and sending
+	c) keep track of source and frequency to prevent spam/duplicates
+	d) config option to limit error count per tick, and # of ticks before a node can trigger another error.
+
+	plan:
+	per-node counter
+	global counter
+
+	if global counter for current tick > config (8) && warning, don't send more
+	if global counter for current tick > config (16) && error, don't send more
+
+	if per-node counter > config (1) && warning, don't send more from this node
+	if per-node counter > config (2) && error, don't send more from this node
+
+	all unsent errors/warnings tallied up and total sent at end of tick
+
+	if a node errors config (10 ticks) in a row, notify user and pause this node's warning for config (5 seconds)
+
+	Use annotations to allow per-node configuration?
+
+	 */
+
+	final int globalErrorLimit = 4;
+	final int globalWarningLimit = 4;
+
+	final int perNodeErrorLimit = 1;
+	final int perNodeWarningLimit = 1;
+
+	int globalErrors;
+	int globalWarnings;
+	final Map<Node, Integer> perLineErrors = new ConcurrentHashMap<>();
+	final Map<Node, Integer> perLineWarnings = new ConcurrentHashMap<>();
+
+
+	final Set<Node> lineTimeouts = new HashSet<>();
+
+
+	public RuntimeErrorManager() {
+		Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), ()->{
+			if (globalErrors > globalErrorLimit) {
+				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("\n<gold>" + (globalErrors - globalErrorLimit) + "<light red> runtime errors were thrown but not displayed this tick.\n"));
+			}
+			if (globalWarnings > globalWarningLimit) {
+				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("\n<gold>" + (globalWarnings - globalWarningLimit) + "<light red> runtime warnings were thrown but not displayed this tick.\n"));
+			}
+			globalErrors = 0;
+			globalWarnings = 0;
+			perLineErrors.clear();
+			perLineWarnings.clear();
+		}, 1, 1);
+	}
+
+	void error(Node node, String message) {
+		// ignore nodes that have been put in timeout.
+		if (lineTimeouts.contains(node))
+			return;
+		// increment counters
+		++globalErrors;
+		int lineErrors = perLineErrors.compute(node, (key, count) -> (count == null ? 0 : count + 1));
+		// print if < limit
+		if (globalErrors <= globalErrorLimit && lineErrors <= perNodeErrorLimit) {
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
+		}
+		// timeout if too many
+		if (lineErrors > perNodeErrorLimit * 2) {
+			lineTimeouts.add(node);
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() + "<light red>' produced too many runtime errors in one tick (<gray>" + perNodeErrorLimit * 2 + "<light red> allowed per tick). No further errors from this line will be printed until the script is reloaded."));
+		}
+	}
+
+	public void warning(Node node, String message) {
+		// increment counters
+		++globalWarnings;
+		int lineWarnings = perLineWarnings.compute(node, (key, count) -> (count == null ? 0 : count + 1));
+		// print if < limit
+		if (globalWarnings <= globalWarningLimit && lineWarnings <= perNodeWarningLimit) {
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
+		}
+
+	}
+
+	public void unlockNodes(Script script) {
+		lineTimeouts.removeIf((node -> node.getConfig().equals(script.getConfig())));
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index a4da0a74f6a..28375ee125b 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -10,10 +10,8 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SyntaxElement;
 import ch.njol.skript.lang.parser.ParserInstance;
-import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.skriptlang.skript.lang.structure.Structure;
@@ -28,6 +26,8 @@ public interface RuntimeErrorProducer {
 
 	// todo: try/catch
 
+	RuntimeErrorManager ERROR_MANAGER = new RuntimeErrorManager();
+
 	/**
 	 * Returns the {@link Node} that this is a part of. Used for accessing the line contents via {@link Node#getKey()}
 	 * and the line number via {@link Node#getLine()}.
@@ -63,7 +63,7 @@ public interface RuntimeErrorProducer {
 	 */
 	default void error(String message) {
 		String formatted = toFormattedString(Level.SEVERE, message, getNode(), toUnderline());
-		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
+		ERROR_MANAGER.error(getNode(), formatted);
 		// todo: check if error should be suppressed, set last error field for users
 		// todo: send notif to online players with permission. "Script x.sk produced a runtime error! Check console."
 	}
@@ -77,7 +77,8 @@ default void error(String message) {
 	 */
 	default void warning(String message) {
 		String formatted = toFormattedString(Level.WARNING, message, getNode(), toUnderline());
-		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
+		ERROR_MANAGER.warning(getNode(), formatted);
+//		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
 		// todo: check if error should be suppressed, set last error field for users
 		// todo: send notif to online players with permission. "Script x.sk produced a runtime warning! Check console."
 	}

From 30e2105cadaf334715d30e044ab5738967daf2b4 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:31:14 -0500
Subject: [PATCH 04/16] frame-based implementation

---
 .../java/ch/njol/skript/ScriptLoader.java     |   6 +-
 .../lang/errors/RuntimeErrorManager.java      | 163 +++++++++++-------
 .../lang/errors/RuntimeErrorProducer.java     |   2 +-
 3 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index b69d01deee4..bc82fa471f1 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -47,11 +47,10 @@
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.errors.RuntimeErrorProducer;
-import org.skriptlang.skript.util.event.EventRegistry;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.util.event.EventRegistry;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -888,9 +887,6 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		// finish unloading + data collection
 		ScriptInfo info = new ScriptInfo();
 		for (Script script : scripts) {
-			// clear nodes from runtime error tracking
-			RuntimeErrorProducer.ERROR_MANAGER.unlockNodes(script);
-
 			List<Structure> structures = script.getStructures();
 
 			info.files++;
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
index 9cce1f8f591..1545fbc65e2 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
@@ -5,103 +5,132 @@
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Utils;
 import org.bukkit.Bukkit;
-import org.skriptlang.skript.lang.script.Script;
 
-import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * Handles duplicate and spammed runtime errors.
  */
 public class RuntimeErrorManager {
 
-	/*
-	a) route all errors through here
-	b) handle formatting and sending
-	c) keep track of source and frequency to prevent spam/duplicates
-	d) config option to limit error count per tick, and # of ticks before a node can trigger another error.
-
-	plan:
-	per-node counter
-	global counter
-
-	if global counter for current tick > config (8) && warning, don't send more
-	if global counter for current tick > config (16) && error, don't send more
-
-	if per-node counter > config (1) && warning, don't send more from this node
-	if per-node counter > config (2) && error, don't send more from this node
-
-	all unsent errors/warnings tallied up and total sent at end of tick
-
-	if a node errors config (10 ticks) in a row, notify user and pause this node's warning for config (5 seconds)
+	private static class Frame {
+
+		final static String plural = "s were";
+		final static String singular= " was";
+
+		final String type;
+		int totalLimit;
+		int lineLimit;
+		int lineTimeoutLimit;
+
+		int skipped;
+		int printed;
+		Map<Node, Integer> lineTotals;
+		Map<Node, Integer> lineSkipped;
+		Map<Node, Integer> timeouts;
+
+		public Frame(String type, int totalLimit, int lineLimit, int lineTimeoutLimit) {
+			this.type = type;
+			this.totalLimit = totalLimit;
+			this.lineLimit = lineLimit;
+			this.lineTimeoutLimit = lineTimeoutLimit;
+			lineTotals = new ConcurrentHashMap<>();
+			lineSkipped = new ConcurrentHashMap<>();
+			timeouts = new ConcurrentHashMap<>();
+		}
 
-	Use annotations to allow per-node configuration?
+		boolean add(Node node) {
+			// increment counter
+			int lineTotal = lineTotals.compute(node, (key, count) -> (count == null ? 1 : count + 1));
 
-	 */
+			// don't print if in timeout
+			if (timeouts.containsKey(node)) {
+				skipped++;
+				lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+				return false;
+			}
 
-	final int globalErrorLimit = 4;
-	final int globalWarningLimit = 4;
+			// decide whether to print
+			if (printed < totalLimit && lineTotal <= lineLimit) {
+				printed++;
+				return true;
+			} else {
+				skipped++;
+				lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+				if (lineTotal == lineTimeoutLimit) {
+					timeouts.put(node, 10);
+				}
+				return false;
+			}
+		}
 
-	final int perNodeErrorLimit = 1;
-	final int perNodeWarningLimit = 1;
+		void nextFrame() {
+			skipped = 0;
+			printed = 0;
+			lineTotals.clear();
+			lineSkipped.clear();
+			for (Iterator<Map.Entry<Node, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
+				Map.Entry<Node, Integer> entry = it.next();
+				if (entry.getValue() > 0)
+					entry.setValue(entry.getValue() - 1);
+				else
+					it.remove();
+			}
+		}
 
-	int globalErrors;
-	int globalWarnings;
-	final Map<Node, Integer> perLineErrors = new ConcurrentHashMap<>();
-	final Map<Node, Integer> perLineWarnings = new ConcurrentHashMap<>();
+		void printFrame() {
+			if (skipped > 0) {
+				String linesNotDisplayed = lineSkipped.entrySet().stream()
+						.map(entry -> "'"+ entry.getKey().getConfig().getFileName() + "' line " + entry.getKey().getLine() + " (" + entry.getValue() + ")")
+						.collect(Collectors.joining(", "));
 
+				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
+						"<gold>" + (skipped) + "<light red> runtime " + type + (skipped > 1 ? plural : singular) +
+						" thrown in the last second but not displayed. From: " +
+						"<gray>" + linesNotDisplayed + "\n \n"));
+			}
 
-	final Set<Node> lineTimeouts = new HashSet<>();
+			for (Map.Entry<Node, Integer> entry : timeouts.entrySet()) {
+				if (entry.getValue() == 10) {
+					Node node = entry.getKey();
+					SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
+						"<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() +
+							"<light red>' produced too many runtime errors (<gray>" + lineTimeoutLimit +
+							"<light red> allowed per second). No errors from this line will be printed for 10 seconds.\n \n"));
+				}
+			}
+		}
+	}
 
+	private final Frame errorFrame, warningFrame;
 
 	public RuntimeErrorManager() {
-		Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), ()->{
-			if (globalErrors > globalErrorLimit) {
-				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("\n<gold>" + (globalErrors - globalErrorLimit) + "<light red> runtime errors were thrown but not displayed this tick.\n"));
-			}
-			if (globalWarnings > globalWarningLimit) {
-				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("\n<gold>" + (globalWarnings - globalWarningLimit) + "<light red> runtime warnings were thrown but not displayed this tick.\n"));
-			}
-			globalErrors = 0;
-			globalWarnings = 0;
-			perLineErrors.clear();
-			perLineWarnings.clear();
-		}, 1, 1);
+		errorFrame = new Frame("error", 8, 2, 4);
+		warningFrame = new Frame("warning", 8, 2, 4);
+		Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), () -> {
+			errorFrame.printFrame();
+			errorFrame.nextFrame();
+
+			warningFrame.printFrame();
+			warningFrame.nextFrame();
+		}, 20, 20);
 	}
 
 	void error(Node node, String message) {
-		// ignore nodes that have been put in timeout.
-		if (lineTimeouts.contains(node))
-			return;
-		// increment counters
-		++globalErrors;
-		int lineErrors = perLineErrors.compute(node, (key, count) -> (count == null ? 0 : count + 1));
 		// print if < limit
-		if (globalErrors <= globalErrorLimit && lineErrors <= perNodeErrorLimit) {
+		if (errorFrame.add(node)) {
 			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
 		}
-		// timeout if too many
-		if (lineErrors > perNodeErrorLimit * 2) {
-			lineTimeouts.add(node);
-			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles("<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() + "<light red>' produced too many runtime errors in one tick (<gray>" + perNodeErrorLimit * 2 + "<light red> allowed per tick). No further errors from this line will be printed until the script is reloaded."));
-		}
 	}
 
-	public void warning(Node node, String message) {
-		// increment counters
-		++globalWarnings;
-		int lineWarnings = perLineWarnings.compute(node, (key, count) -> (count == null ? 0 : count + 1));
+	void warning(Node node, String message){
 		// print if < limit
-		if (globalWarnings <= globalWarningLimit && lineWarnings <= perNodeWarningLimit) {
+		if (warningFrame.add(node)) {
 			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
 		}
-
-	}
-
-	public void unlockNodes(Script script) {
-		lineTimeouts.removeIf((node -> node.getConfig().equals(script.getConfig())));
 	}
 
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index 28375ee125b..f673c8b5656 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -98,7 +98,7 @@ default String toFormattedString(Level level, String message, Node node, String
 		// todo: add lang entries, handle error vs warning
 		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles("<light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s:\n"));
 		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<light red>%s<reset>\n"));
-		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<gold>Line %s<white>: <gray>%s\n"));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<gold>Line %s<white>: <gray>%s\n \n"));
 
 		if (node == null)
 			return "handle null nodes";

From d832bc3263b639e573f5ca46c2291c1ad74f1331 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:21:54 -0500
Subject: [PATCH 05/16] pull frame out into its own file

---
 .../skriptlang/skript/lang/errors/Frame.java  | 103 ++++++++++++++++++
 .../lang/errors/RuntimeErrorManager.java      | 102 ++---------------
 .../lang/errors/RuntimeErrorProducer.java     |  17 +--
 3 files changed, 119 insertions(+), 103 deletions(-)
 create mode 100644 src/main/java/org/skriptlang/skript/lang/errors/Frame.java

diff --git a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
new file mode 100644
index 00000000000..7480ee5b61d
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
@@ -0,0 +1,103 @@
+package org.skriptlang.skript.lang.errors;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Utils;
+import org.bukkit.Bukkit;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+public class Frame {
+
+	final static String plural = "s were";
+	final static String singular= " was";
+
+	final String type;
+	int totalLimit;
+	int lineLimit;
+	int lineTimeoutLimit;
+
+	int skipped;
+	int printed;
+	Map<Node, Integer> lineTotals;
+	Map<Node, Integer> lineSkipped;
+	Map<Node, Integer> timeouts;
+
+	public Frame(String type, int totalLimit, int lineLimit, int lineTimeoutLimit) {
+		this.type = type;
+		this.totalLimit = totalLimit;
+		this.lineLimit = lineLimit;
+		this.lineTimeoutLimit = lineTimeoutLimit;
+		lineTotals = new ConcurrentHashMap<>();
+		lineSkipped = new ConcurrentHashMap<>();
+		timeouts = new ConcurrentHashMap<>();
+	}
+
+	boolean add(Node node) {
+		// increment counter
+		int lineTotal = lineTotals.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+
+		// don't print if in timeout
+		if (timeouts.containsKey(node)) {
+			skipped++;
+			lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+			return false;
+		}
+
+		// decide whether to print
+		if (printed < totalLimit && lineTotal <= lineLimit) {
+			printed++;
+			return true;
+		} else {
+			skipped++;
+			lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+			if (lineTotal == lineTimeoutLimit) {
+				timeouts.put(node, 10);
+			}
+			return false;
+		}
+	}
+
+	void nextFrame() {
+		skipped = 0;
+		printed = 0;
+		lineTotals.clear();
+		lineSkipped.clear();
+		for (Iterator<Map.Entry<Node, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<Node, Integer> entry = it.next();
+			if (entry.getValue() > 0)
+				entry.setValue(entry.getValue() - 1);
+			else
+				it.remove();
+		}
+	}
+
+	void printFrame() {
+		if (skipped > 0) {
+			String linesNotDisplayed = lineSkipped.entrySet().stream()
+				.map(entry -> "'"+ entry.getKey().getConfig().getFileName() + "' line " + entry.getKey().getLine() + " (" + entry.getValue() + ")")
+				.collect(Collectors.joining(", "));
+
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
+				"<gold>" + (skipped) + "<light red> runtime " + type + (skipped > 1 ? plural : singular) +
+					" thrown in the last second but not displayed. From: " +
+					"<gray>" + linesNotDisplayed + "\n \n"));
+		}
+
+		for (Map.Entry<Node, Integer> entry : timeouts.entrySet()) {
+			if (entry.getValue() == 10) {
+				Node node = entry.getKey();
+				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
+					"<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() +
+						"<light red>' produced too many runtime errors (<gray>" + lineTimeoutLimit +
+						"<light red> allowed per second). No errors from this line will be printed for 10 seconds.\n \n"));
+			}
+		}
+
+		// todo: send notif to online players with permission. "Script x.sk produced a runtime error! Check console."
+
+	}
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
index 1545fbc65e2..2a07b109162 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
@@ -3,108 +3,13 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.skript.util.Utils;
 import org.bukkit.Bukkit;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
 /**
  * Handles duplicate and spammed runtime errors.
  */
 public class RuntimeErrorManager {
 
-	private static class Frame {
-
-		final static String plural = "s were";
-		final static String singular= " was";
-
-		final String type;
-		int totalLimit;
-		int lineLimit;
-		int lineTimeoutLimit;
-
-		int skipped;
-		int printed;
-		Map<Node, Integer> lineTotals;
-		Map<Node, Integer> lineSkipped;
-		Map<Node, Integer> timeouts;
-
-		public Frame(String type, int totalLimit, int lineLimit, int lineTimeoutLimit) {
-			this.type = type;
-			this.totalLimit = totalLimit;
-			this.lineLimit = lineLimit;
-			this.lineTimeoutLimit = lineTimeoutLimit;
-			lineTotals = new ConcurrentHashMap<>();
-			lineSkipped = new ConcurrentHashMap<>();
-			timeouts = new ConcurrentHashMap<>();
-		}
-
-		boolean add(Node node) {
-			// increment counter
-			int lineTotal = lineTotals.compute(node, (key, count) -> (count == null ? 1 : count + 1));
-
-			// don't print if in timeout
-			if (timeouts.containsKey(node)) {
-				skipped++;
-				lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
-				return false;
-			}
-
-			// decide whether to print
-			if (printed < totalLimit && lineTotal <= lineLimit) {
-				printed++;
-				return true;
-			} else {
-				skipped++;
-				lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
-				if (lineTotal == lineTimeoutLimit) {
-					timeouts.put(node, 10);
-				}
-				return false;
-			}
-		}
-
-		void nextFrame() {
-			skipped = 0;
-			printed = 0;
-			lineTotals.clear();
-			lineSkipped.clear();
-			for (Iterator<Map.Entry<Node, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
-				Map.Entry<Node, Integer> entry = it.next();
-				if (entry.getValue() > 0)
-					entry.setValue(entry.getValue() - 1);
-				else
-					it.remove();
-			}
-		}
-
-		void printFrame() {
-			if (skipped > 0) {
-				String linesNotDisplayed = lineSkipped.entrySet().stream()
-						.map(entry -> "'"+ entry.getKey().getConfig().getFileName() + "' line " + entry.getKey().getLine() + " (" + entry.getValue() + ")")
-						.collect(Collectors.joining(", "));
-
-				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
-						"<gold>" + (skipped) + "<light red> runtime " + type + (skipped > 1 ? plural : singular) +
-						" thrown in the last second but not displayed. From: " +
-						"<gray>" + linesNotDisplayed + "\n \n"));
-			}
-
-			for (Map.Entry<Node, Integer> entry : timeouts.entrySet()) {
-				if (entry.getValue() == 10) {
-					Node node = entry.getKey();
-					SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
-						"<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() +
-							"<light red>' produced too many runtime errors (<gray>" + lineTimeoutLimit +
-							"<light red> allowed per second). No errors from this line will be printed for 10 seconds.\n \n"));
-				}
-			}
-		}
-	}
-
 	private final Frame errorFrame, warningFrame;
 
 	public RuntimeErrorManager() {
@@ -133,4 +38,11 @@ void warning(Node node, String message){
 		}
 	}
 
+	public Frame getErrorFrame() {
+		return errorFrame;
+	}
+
+	public Frame getWarningFrame() {
+		return warningFrame;
+	}
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index f673c8b5656..1c591e9f7ce 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -58,29 +58,30 @@ public interface RuntimeErrorProducer {
 	 * Dispatches a runtime error with the given text.
 	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
 	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the error.
 	 *
 	 * @param message The text to display as the error message.
 	 */
 	default void error(String message) {
-		String formatted = toFormattedString(Level.SEVERE, message, getNode(), toUnderline());
+		String formatted = toFormattedErrorString(Level.SEVERE, message, getNode(), toUnderline());
 		ERROR_MANAGER.error(getNode(), formatted);
-		// todo: check if error should be suppressed, set last error field for users
-		// todo: send notif to online players with permission. "Script x.sk produced a runtime error! Check console."
+		// todo: check if error should be suppressed
 	}
 
 	/**
 	 * Dispatches a runtime warning with the given text.
 	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
 	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the warning.
 	 *
 	 * @param message The text to display as the error message.
 	 */
 	default void warning(String message) {
-		String formatted = toFormattedString(Level.WARNING, message, getNode(), toUnderline());
+		String formatted = toFormattedErrorString(Level.WARNING, message, getNode(), toUnderline());
 		ERROR_MANAGER.warning(getNode(), formatted);
-//		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), formatted);
-		// todo: check if error should be suppressed, set last error field for users
-		// todo: send notif to online players with permission. "Script x.sk produced a runtime warning! Check console."
+		// todo: check if error should be suppressed
 	}
 
 	/**
@@ -93,7 +94,7 @@ default void warning(String message) {
 	 * @return A formatted string that includes metadata such as the script filename, error message,
 	 * 			and the specific line that caused the error.
 	 */
-	default String toFormattedString(Level level, String message, Node node, String toUnderline) {
+	private @NotNull String toFormattedErrorString(Level level, String message, Node node, String toUnderline) {
 		// Replace configured messages chat styles without user variables
 		// todo: add lang entries, handle error vs warning
 		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles("<light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s:\n"));

From 6868d30b39a25cec4370b38b0e961645463a23da Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:05:57 -0500
Subject: [PATCH 06/16] lang entries

---
 src/main/java/ch/njol/skript/Skript.java      | 30 ++++++++++---
 .../lang/errors/RuntimeErrorProducer.java     | 43 ++++++++++++++-----
 src/main/resources/lang/english.lang          |  5 +++
 3 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 8b03eaca40b..379084819cb 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -29,7 +29,6 @@
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.Message;
 import ch.njol.skript.localization.PluralizingArgsMessage;
@@ -44,7 +43,12 @@
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.registrations.Feature;
-import ch.njol.skript.test.runner.*;
+import ch.njol.skript.test.runner.EffObjectives;
+import ch.njol.skript.test.runner.SkriptAsyncJUnitTest;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.test.runner.SkriptTestEvent;
+import ch.njol.skript.test.runner.TestMode;
+import ch.njol.skript.test.runner.TestTracker;
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.update.ReleaseManifest;
 import ch.njol.skript.update.ReleaseStatus;
@@ -66,13 +70,14 @@
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.iterator.CheckedIterator;
 import ch.njol.util.coll.iterator.EnumerationIterable;
-
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
-
 import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
@@ -101,6 +106,7 @@
 import org.skriptlang.skript.lang.converter.Converter;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
 import org.skriptlang.skript.lang.experiment.ExperimentRegistry;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
@@ -380,6 +386,15 @@ public File getScriptsFolder() {
 		return scriptsFolder;
 	}
 
+
+	// ================ RUNTIME ERRORS ================
+	private static RuntimeErrorManager runtimeErrorManager;
+
+	public static RuntimeErrorManager getRuntimeErrorManager() {
+		return runtimeErrorManager;
+	}
+	// =================================================
+
 	@Override
 	public void onEnable() {
 		Bukkit.getPluginManager().registerEvents(this, this);
@@ -565,6 +580,8 @@ public void onEnable() {
 
 		Commands.registerListeners();
 
+		runtimeErrorManager = new RuntimeErrorManager();
+
 		if (logNormal())
 			info(" " + Language.get("skript.copyright"));
 
@@ -1965,6 +1982,7 @@ public static void error(final CommandSender sender, final String error) {
 		sender.sendMessage(Utils.replaceEnglishChatStyles(getSkriptPrefix() + ChatColor.DARK_RED + error));
 	}
 
+
 	/**
 	 * Gets the updater instance currently used by Skript.
 	 * @return SkriptUpdater instance.
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index 1c591e9f7ce..8b721f1284b 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -1,5 +1,6 @@
 package org.skriptlang.skript.lang.errors;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.config.Config;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.doc.Name;
@@ -10,6 +11,7 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SyntaxElement;
 import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
 import org.jetbrains.annotations.Contract;
@@ -24,9 +26,7 @@
  */
 public interface RuntimeErrorProducer {
 
-	// todo: try/catch
-
-	RuntimeErrorManager ERROR_MANAGER = new RuntimeErrorManager();
+	// todo: try/catch, suppression when annotations are added
 
 	/**
 	 * Returns the {@link Node} that this is a part of. Used for accessing the line contents via {@link Node#getKey()}
@@ -65,8 +65,7 @@ public interface RuntimeErrorProducer {
 	 */
 	default void error(String message) {
 		String formatted = toFormattedErrorString(Level.SEVERE, message, getNode(), toUnderline());
-		ERROR_MANAGER.error(getNode(), formatted);
-		// todo: check if error should be suppressed
+		Skript.getRuntimeErrorManager().error(getNode(), formatted);
 	}
 
 	/**
@@ -80,10 +79,17 @@ default void error(String message) {
 	 */
 	default void warning(String message) {
 		String formatted = toFormattedErrorString(Level.WARNING, message, getNode(), toUnderline());
-		ERROR_MANAGER.warning(getNode(), formatted);
-		// todo: check if error should be suppressed
+		Skript.getRuntimeErrorManager().warning(getNode(), formatted);
 	}
 
+	String CONFIG_NODE = "skript command.reload";
+	ArgsMessage WARNING_DETAILS = new ArgsMessage(CONFIG_NODE + ".warning details");
+	ArgsMessage ERROR_DETAILS = new ArgsMessage(CONFIG_NODE + ".error details");
+	ArgsMessage OTHER_DETAILS = new ArgsMessage(CONFIG_NODE + ".other details");
+	ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.error");
+	ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.warning");
+	ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.line info");
+
 	/**
 	 * Generates a formatted string based on the provided log level, message, node information, and text to underline.
 	 *
@@ -97,12 +103,27 @@ default void warning(String message) {
 	private @NotNull String toFormattedErrorString(Level level, String message, Node node, String toUnderline) {
 		// Replace configured messages chat styles without user variables
 		// todo: add lang entries, handle error vs warning
-		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles("<light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s:\n"));
-		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<light red>%s<reset>\n"));
-		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles("\t<gold>Line %s<white>: <gray>%s\n \n"));
+
+
+		ArgsMessage details;
+		ArgsMessage info;
+		if (level.intValue() == Level.WARNING.intValue()) { // warnings
+			details = WARNING_DETAILS;
+			info = WARNING_INFO;
+		} else if (level.intValue() == Level.SEVERE.intValue()) { // errors
+			details = ERROR_DETAILS;
+			info = ERROR_INFO;
+		} else { // anything else
+			details = OTHER_DETAILS;
+			info = WARNING_INFO;
+		}
+
+		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
+		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
 
 		if (node == null)
-			return "handle null nodes";
+			return "effect command produced error"; // TODO
 
 		Config c = node.getConfig();
 		String from = this.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index ad2b1eb8ef9..a2b1e37bcf4 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -65,6 +65,11 @@ skript command:
 		other details: <white>    %s<reset>\n
 		line details: <gold>    Line: <gray>%s<reset>\n <reset>
 
+		runtime:
+			error: <light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s<light red>:\n
+			warning: <gold>The script '<gray>%s<gold>' encountered a warning while executing the '<gray>%s<gold>' %s<gold>:\n
+			line info: <gold>    Line %s<white>: <gray>%s\n \n
+
 		config, aliases and scripts: the config, aliases and all scripts
 		scripts: all scripts
 		main config: the main configuration

From 573b80e163006b31657c540fb58851b8b3b5e200 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Sun, 15 Dec 2024 19:55:37 -0500
Subject: [PATCH 07/16] Add config settings and permission-gated chat
 notifications

---
 src/main/java/ch/njol/skript/Skript.java      |  6 +-
 .../java/ch/njol/skript/SkriptCommand.java    |  3 +
 .../java/ch/njol/skript/SkriptConfig.java     | 15 +++++
 .../skriptlang/skript/lang/errors/Frame.java  | 54 +++++++++++----
 .../lang/errors/RuntimeErrorManager.java      | 66 +++++++++++++++++--
 .../lang/errors/RuntimeErrorProducer.java     |  2 +-
 src/main/resources/config.sk                  | 38 +++++++++++
 src/main/resources/plugin.yml                 |  6 +-
 8 files changed, 162 insertions(+), 28 deletions(-)

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 379084819cb..d9fe8c7c8fe 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -388,10 +388,8 @@ public File getScriptsFolder() {
 
 
 	// ================ RUNTIME ERRORS ================
-	private static RuntimeErrorManager runtimeErrorManager;
-
 	public static RuntimeErrorManager getRuntimeErrorManager() {
-		return runtimeErrorManager;
+		return RuntimeErrorManager.getInstance();
 	}
 	// =================================================
 
@@ -580,7 +578,7 @@ public void onEnable() {
 
 		Commands.registerListeners();
 
-		runtimeErrorManager = new RuntimeErrorManager();
+		RuntimeErrorManager.refresh();
 
 		if (logNormal())
 			info(" " + Language.get("skript.copyright"));
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 16050ef8e14..922ce2ece4c 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -45,6 +45,7 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
 import org.skriptlang.skript.lang.script.Script;
 
 import java.io.File;
@@ -158,6 +159,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				if (args[1].equalsIgnoreCase("all")) {
 					reloading(sender, "config, aliases and scripts", logHandler);
 					SkriptConfig.load();
+					RuntimeErrorManager.refresh();
 					Aliases.clear();
 					Aliases.load();
 
@@ -181,6 +183,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				} else if (args[1].equalsIgnoreCase("config")) {
 					reloading(sender, "main config", logHandler);
 					SkriptConfig.load();
+					RuntimeErrorManager.refresh();
 					reloaded(sender, logHandler, timingLogHandler, "main config");
 				} else if (args[1].equalsIgnoreCase("aliases")) {
 					reloading(sender, "aliases", logHandler);
diff --git a/src/main/java/ch/njol/skript/SkriptConfig.java b/src/main/java/ch/njol/skript/SkriptConfig.java
index 0c6e0f347e2..c73e5ddb069 100644
--- a/src/main/java/ch/njol/skript/SkriptConfig.java
+++ b/src/main/java/ch/njol/skript/SkriptConfig.java
@@ -329,6 +329,21 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean
 
 	public static final Option<Timespan> longParseTimeWarningThreshold = new Option<>("long parse time warning threshold", new Timespan(0));
 
+
+	public static final Option<Timespan> runtimeErrorFrameDuration = new Option<>("runtime errors.frame duration", new Timespan(Timespan.TimePeriod.SECOND, 1));
+
+	public static final Option<Integer> runtimeErrorLimitTotal = new Option<>("runtime errors.total errors per frame",8);
+	public static final Option<Integer> runtimeWarningLimitTotal = new Option<>("runtime errors.total warnings per frame",8);
+
+	public static final Option<Integer> runtimeErrorLimitLine = new Option<>("runtime errors.errors from one line per frame",2);
+	public static final Option<Integer> runtimeWarningLimitLine = new Option<>("runtime errors.warnings from one line per frame",2);
+
+	public static final Option<Integer> runtimeErrorLimitLineTimeout = new Option<>("runtime errors.error spam timeout limit",4);
+	public static final Option<Integer> runtimeWarningLimitLineTimeout = new Option<>("runtime errors.warning spam timeout limit",4);
+
+	public static final Option<Integer> runtimeErrorTimeoutDuration = new Option<>("runtime errors.error timeout length",10);
+	public static final Option<Integer> runtimeWarningTimeoutDuration= new Option<>("runtime errors.warning timeout length",10);
+
 	/**
 	 * This should only be used in special cases
 	 */
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
index 7480ee5b61d..fa84e4cfa96 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
@@ -4,21 +4,33 @@
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Utils;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
+/**
+ * Stores the accumulated runtime errors over a span of time, then prints them.
+ */
 public class Frame {
 
+	/**
+	 * Store limits for the number of issues a frame can print per frame.
+	 * @param totalLimit total issues printed per frame
+	 * @param lineLimit issues printed by one line per frame
+	 * @param lineTimeoutLimit the limit at which a line will be put in timeout for exceeding.
+	 * @param timeoutDuration the duration a line will stay in timeout, in frames.
+	 */
+	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) {}
+
 	final static String plural = "s were";
 	final static String singular= " was";
 
 	final String type;
-	int totalLimit;
-	int lineLimit;
-	int lineTimeoutLimit;
+	final FrameLimit limits;
 
 	int skipped;
 	int printed;
@@ -26,11 +38,9 @@ public class Frame {
 	Map<Node, Integer> lineSkipped;
 	Map<Node, Integer> timeouts;
 
-	public Frame(String type, int totalLimit, int lineLimit, int lineTimeoutLimit) {
+	public Frame(String type, FrameLimit limits) {
 		this.type = type;
-		this.totalLimit = totalLimit;
-		this.lineLimit = lineLimit;
-		this.lineTimeoutLimit = lineTimeoutLimit;
+		this.limits = limits;
 		lineTotals = new ConcurrentHashMap<>();
 		lineSkipped = new ConcurrentHashMap<>();
 		timeouts = new ConcurrentHashMap<>();
@@ -48,14 +58,14 @@ boolean add(Node node) {
 		}
 
 		// decide whether to print
-		if (printed < totalLimit && lineTotal <= lineLimit) {
+		if (printed < limits.totalLimit && lineTotal <= limits.lineLimit) {
 			printed++;
 			return true;
 		} else {
 			skipped++;
 			lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
-			if (lineTotal == lineTimeoutLimit) {
-				timeouts.put(node, 10);
+			if (lineTotal == limits.lineTimeoutLimit) {
+				timeouts.put(node, limits.timeoutDuration);
 			}
 			return false;
 		}
@@ -88,16 +98,32 @@ void printFrame() {
 		}
 
 		for (Map.Entry<Node, Integer> entry : timeouts.entrySet()) {
-			if (entry.getValue() == 10) {
+			if (entry.getValue() == limits.timeoutDuration) {
 				Node node = entry.getKey();
 				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
 					"<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() +
-						"<light red>' produced too many runtime errors (<gray>" + lineTimeoutLimit +
-						"<light red> allowed per second). No errors from this line will be printed for 10 seconds.\n \n"));
+						"<light red>' produced too many runtime errors (<gray>" + limits.lineTimeoutLimit +
+						"<light red> allowed per second). No errors from this line will be printed for " + limits.timeoutDuration + " frames.\n \n"));
 			}
 		}
 
-		// todo: send notif to online players with permission. "Script x.sk produced a runtime error! Check console."
+		if (printed > 0) {
+			// get various scripts from nodes
+			Set<String> scripts = lineTotals.keySet().stream()
+				.map((node) -> node.getConfig().getFileName())
+				.collect(Collectors.toSet());
+			String message = "<light red>Script '<gray>" + scripts.iterator().next();
+			if (scripts.size() > 1) {
+				message += "<light red>' and " + (scripts.size() - 1) + " others";
+			}
+			message += "<light red> produced runtime errors. Please check console logs for details.";
+
+			for (Player player : Bukkit.getOnlinePlayers()) {
+				if (player.hasPermission(RuntimeErrorManager.ERROR_NOTIF_PERMISSION))
+					SkriptLogger.sendFormatted(player, message);
+			}
+		}
 
 	}
+
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
index 2a07b109162..ec3dc29cf09 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
@@ -1,29 +1,78 @@
 package org.skriptlang.skript.lang.errors;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Timespan;
 import org.bukkit.Bukkit;
+import org.skriptlang.skript.lang.errors.Frame.FrameLimit;
+
+import java.io.Closeable;
 
 /**
  * Handles duplicate and spammed runtime errors.
  */
-public class RuntimeErrorManager {
+public class RuntimeErrorManager implements Closeable {
+
+
+	public final static String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
+
+	private static RuntimeErrorManager instance;
+
+	public static RuntimeErrorManager getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Refreshes the runtime error manager for Skript, pulling from the config values.
+	 */
+	public static void refresh() {
+
+		long frameLength = SkriptConfig.runtimeErrorFrameDuration.value().getAs(Timespan.TimePeriod.TICK);
+
+		int errorLimit = SkriptConfig.runtimeErrorLimitTotal.value();
+		int errorLineLimit = SkriptConfig.runtimeErrorLimitLine.value();
+		int errorLineTimeout = SkriptConfig.runtimeErrorLimitLineTimeout.value();
+		int errorTimeoutLength = Math.max(SkriptConfig.runtimeErrorTimeoutDuration.value(), 1);
+		FrameLimit errorFrame = new FrameLimit(errorLimit, errorLineLimit, errorLineTimeout, errorTimeoutLength);
+
+		int warningLimit = SkriptConfig.runtimeWarningLimitTotal.value();
+		int warningLineLimit = SkriptConfig.runtimeWarningLimitLine.value();
+		int warningLineTimeout = SkriptConfig.runtimeWarningLimitLineTimeout.value();
+		int warningTimeoutLength = Math.max(SkriptConfig.runtimeWarningTimeoutDuration.value(), 1);
+		FrameLimit warningFrame = new FrameLimit(warningLimit, warningLineLimit, warningLineTimeout, warningTimeoutLength);
+
+		if (instance != null)
+			instance.close();
+		instance = new RuntimeErrorManager(Math.max((int) frameLength, 1), errorFrame, warningFrame);
+	}
 
 	private final Frame errorFrame, warningFrame;
+	private final int taskId;
 
-	public RuntimeErrorManager() {
-		errorFrame = new Frame("error", 8, 2, 4);
-		warningFrame = new Frame("warning", 8, 2, 4);
-		Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), () -> {
+	/**
+	 * Creates a new error manager, which also creates its own frames.
+	 * <br>
+	 * Must be closed when no longer being used.
+	 *
+	 * @param frameLength The length of a frame in ticks.
+	 * @param errorLimits The limits to the error frame.
+	 * @param warningLimits The limits to the warning frame.
+	 */
+	public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit warningLimits) {
+		errorFrame = new Frame("error", errorLimits);
+		warningFrame = new Frame("warning", warningLimits);
+		taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), () -> {
 			errorFrame.printFrame();
 			errorFrame.nextFrame();
 
 			warningFrame.printFrame();
 			warningFrame.nextFrame();
-		}, 20, 20);
+		}, frameLength, frameLength);
 	}
 
+
 	void error(Node node, String message) {
 		// print if < limit
 		if (errorFrame.add(node)) {
@@ -45,4 +94,9 @@ public Frame getErrorFrame() {
 	public Frame getWarningFrame() {
 		return warningFrame;
 	}
+
+	@Override
+	public void close() {
+		Bukkit.getScheduler().cancelTask(taskId);
+	}
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index 8b721f1284b..4c63d29fa20 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -100,7 +100,7 @@ default void warning(String message) {
 	 * @return A formatted string that includes metadata such as the script filename, error message,
 	 * 			and the specific line that caused the error.
 	 */
-	private @NotNull String toFormattedErrorString(Level level, String message, Node node, String toUnderline) {
+	private @NotNull String toFormattedErrorString(@NotNull Level level, String message, Node node, String toUnderline) {
 		// Replace configured messages chat styles without user variables
 		// todo: add lang entries, handle error vs warning
 
diff --git a/src/main/resources/config.sk b/src/main/resources/config.sk
index 1461b3becc6..5364643cfaf 100644
--- a/src/main/resources/config.sk
+++ b/src/main/resources/config.sk
@@ -234,6 +234,44 @@ long parse time warning threshold: 0 seconds
 #   stating that the statement has taken a long time to parse.
 # A value of 0 seconds means that this warning should be disabled.
 
+
+# ==== Runtime Errors ====
+
+runtime errors:
+	frame duration: 1 second
+	# Frames are the duration over which runtime errors will be collected before being sent off to console.
+	# If you find runtime errors to be annoying or clogging your console, you should first fix them!
+	# You can also lengthen this duration to reduce the amount of individual errors printed to console.
+
+	# -- Errors --
+	total errors per frame: 8
+	# This controls the maximum number of individual errors that will be printed per frame.
+	# If more errors occur, they will be hidden and the frame will simply display that x number of
+	# errors occurred but were hidden this frame.
+
+	errors from one line per frame: 2
+	# This controls the maximum number of errors a single line can print per frame. This is used to prevent
+	# line from clogging up the frame, like if a syntax was in a 10 iteration loop and errored every time.
+	# It's best to keep this rather low.
+
+	error spam timeout limit: 4
+	# If a line prints more than this many errors in a single frame, it will be put in timeout. This means
+	# any additional errors it creates during the timeout duration will be hidden, rather than printed.
+	# This is also a defense against a syntax in a loop spamming console with errors.
+
+	error timeout length: 10
+	# This is the number of frames before a line in timeout can print errors again.
+	# If you lengthen the frame duration, you may want to lower this proportionally.
+
+	# -- Warnings --
+	# All the above descriptions for errors apply the same here, but for warnings instead.
+
+	total warnings per frame: 8
+	warnings from one line per frame: 2
+	warning spam timeout limit: 4
+	warning timeout length: 10
+
+
 # ==== Variables ====
 
 databases:
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 344b536ab87..9379e3afb32 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -53,6 +53,6 @@ permissions:
     skript.admin:
         default: op
         description: Allows to use administrative commands and to recieve notifications of new versions.
-#    skript.config:
-#        description: allows to modify the configuration files via commands
-#        default: false
+    skript.see_runtime_errors:
+        default: op
+        description: Shows notifications in chat when runtime errors occur.

From 5efd862a9e4ca288432d93821f4031b84c8fcb26 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:09:04 -0500
Subject: [PATCH 08/16] Partial requested changes

---
 src/main/java/ch/njol/skript/Skript.java      |  1 -
 .../java/ch/njol/skript/SkriptConfig.java     | 16 +++++-----
 .../ch/njol/skript/entity/EntityData.java     |  7 +++++
 .../base/SimplePropertyExpression.java        |  2 +-
 .../java/ch/njol/skript/lang/Condition.java   |  6 ++++
 src/main/java/ch/njol/skript/lang/Effect.java |  6 ++++
 .../java/ch/njol/skript/lang/Expression.java  |  5 ++++
 .../java/ch/njol/skript/lang/Section.java     |  6 ++++
 .../ch/njol/skript/lang/SyntaxElement.java    |  8 +++++
 .../njol/skript/util/visual/VisualEffect.java |  6 ++++
 .../skriptlang/skript/lang/errors/Frame.java  | 22 +++++++-------
 .../lang/errors/RuntimeErrorManager.java      | 23 +++++++++------
 .../lang/errors/RuntimeErrorProducer.java     | 29 +++++--------------
 .../skript/lang/structure/Structure.java      |  5 ++++
 14 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 32252b75df2..6fc24a99a4a 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -1976,7 +1976,6 @@ public static void error(final CommandSender sender, final String error) {
 		sender.sendMessage(Utils.replaceEnglishChatStyles(getSkriptPrefix() + ChatColor.DARK_RED + error));
 	}
 
-
 	/**
 	 * Gets the updater instance currently used by Skript.
 	 * @return SkriptUpdater instance.
diff --git a/src/main/java/ch/njol/skript/SkriptConfig.java b/src/main/java/ch/njol/skript/SkriptConfig.java
index 5cc2308e8df..86c942feb5c 100644
--- a/src/main/java/ch/njol/skript/SkriptConfig.java
+++ b/src/main/java/ch/njol/skript/SkriptConfig.java
@@ -332,17 +332,17 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean
 
 	public static final Option<Timespan> runtimeErrorFrameDuration = new Option<>("runtime errors.frame duration", new Timespan(Timespan.TimePeriod.SECOND, 1));
 
-	public static final Option<Integer> runtimeErrorLimitTotal = new Option<>("runtime errors.total errors per frame",8);
-	public static final Option<Integer> runtimeWarningLimitTotal = new Option<>("runtime errors.total warnings per frame",8);
+	public static final Option<Integer> runtimeErrorLimitTotal = new Option<>("runtime errors.total errors per frame", 8);
+	public static final Option<Integer> runtimeWarningLimitTotal = new Option<>("runtime errors.total warnings per frame", 8);
 
-	public static final Option<Integer> runtimeErrorLimitLine = new Option<>("runtime errors.errors from one line per frame",2);
-	public static final Option<Integer> runtimeWarningLimitLine = new Option<>("runtime errors.warnings from one line per frame",2);
+	public static final Option<Integer> runtimeErrorLimitLine = new Option<>("runtime errors.errors from one line per frame", 2);
+	public static final Option<Integer> runtimeWarningLimitLine = new Option<>("runtime errors.warnings from one line per frame", 2);
 
-	public static final Option<Integer> runtimeErrorLimitLineTimeout = new Option<>("runtime errors.error spam timeout limit",4);
-	public static final Option<Integer> runtimeWarningLimitLineTimeout = new Option<>("runtime errors.warning spam timeout limit",4);
+	public static final Option<Integer> runtimeErrorLimitLineTimeout = new Option<>("runtime errors.error spam timeout limit", 4);
+	public static final Option<Integer> runtimeWarningLimitLineTimeout = new Option<>("runtime errors.warning spam timeout limit", 4);
 
-	public static final Option<Integer> runtimeErrorTimeoutDuration = new Option<>("runtime errors.error timeout length",10);
-	public static final Option<Integer> runtimeWarningTimeoutDuration= new Option<>("runtime errors.warning timeout length",10);
+	public static final Option<Integer> runtimeErrorTimeoutDuration = new Option<>("runtime errors.error timeout length", 10);
+	public static final Option<Integer> runtimeWarningTimeoutDuration = new Option<>("runtime errors.warning timeout length", 10);
 
 	/**
 	 * This should only be used in special cases
diff --git a/src/main/java/ch/njol/skript/entity/EntityData.java b/src/main/java/ch/njol/skript/entity/EntityData.java
index d11bb42882c..aa7994737df 100644
--- a/src/main/java/ch/njol/skript/entity/EntityData.java
+++ b/src/main/java/ch/njol/skript/entity/EntityData.java
@@ -52,6 +52,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.NotSerializableException;
@@ -666,6 +667,11 @@ protected boolean deserialize(final String s) {
 		return false;
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "entity data";
+	}
+
 	@SuppressWarnings({"unchecked", "deprecation"})
 	protected static <E extends Entity> @Nullable E spawn(Location location, Class<E> type, Consumer<E> consumer) {
 		World world = location.getWorld();
@@ -687,4 +693,5 @@ protected boolean deserialize(final String s) {
         return world.spawn(location, type, consumer);
 	}
 
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index 90071bdef6d..ebdbf18e40f 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -50,7 +50,7 @@ public Node getNode() {
 	}
 
 	@Override
-	public String toUnderline() {
+	public String toHighlight() {
 		return rawExpr;
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/Condition.java b/src/main/java/ch/njol/skript/lang/Condition.java
index 5e3d287fce1..37c656c4e04 100644
--- a/src/main/java/ch/njol/skript/lang/Condition.java
+++ b/src/main/java/ch/njol/skript/lang/Condition.java
@@ -23,6 +23,7 @@
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.condition.Conditional;
 
@@ -93,6 +94,11 @@ public final boolean isNegated() {
 		return negated;
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "condition";
+	}
+
 	/**
 	 * Parse a raw string input as a condition.
 	 * 
diff --git a/src/main/java/ch/njol/skript/lang/Effect.java b/src/main/java/ch/njol/skript/lang/Effect.java
index e8d2338313a..3f6ebd0f79f 100644
--- a/src/main/java/ch/njol/skript/lang/Effect.java
+++ b/src/main/java/ch/njol/skript/lang/Effect.java
@@ -23,6 +23,7 @@
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Iterator;
@@ -81,4 +82,9 @@ public final boolean run(Event event) {
 		}
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "effect";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/Expression.java b/src/main/java/ch/njol/skript/lang/Expression.java
index 8dea5655be5..11ba4b0dea6 100644
--- a/src/main/java/ch/njol/skript/lang/Expression.java
+++ b/src/main/java/ch/njol/skript/lang/Expression.java
@@ -432,4 +432,9 @@ default <R> void changeInPlace(Event event, Function<T, R> changeFunction, boole
 		return newDelta == null ? delta : newDelta;
 	}
 
+	@Override
+	default @NotNull String getSyntaxTypeName() {
+		return "expression";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/Section.java b/src/main/java/ch/njol/skript/lang/Section.java
index 17401f559c7..a6ec14d4843 100644
--- a/src/main/java/ch/njol/skript/lang/Section.java
+++ b/src/main/java/ch/njol/skript/lang/Section.java
@@ -26,6 +26,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -263,4 +264,9 @@ public boolean claimed() {
 
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "section";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/SyntaxElement.java b/src/main/java/ch/njol/skript/lang/SyntaxElement.java
index 5ab3589733c..171b621d9bc 100644
--- a/src/main/java/ch/njol/skript/lang/SyntaxElement.java
+++ b/src/main/java/ch/njol/skript/lang/SyntaxElement.java
@@ -21,6 +21,8 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a general part of the syntax.
@@ -47,4 +49,10 @@ default ParserInstance getParser() {
 		return ParserInstance.get();
 	}
 
+	/**
+	 * @return A string naming the type of syntax this is. e.g. "expression", "section".
+	 */
+	@Contract(pure = true)
+	@NotNull String getSyntaxTypeName();
+
 }
diff --git a/src/main/java/ch/njol/skript/util/visual/VisualEffect.java b/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
index 02aa5a25a6c..a277a442925 100644
--- a/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
+++ b/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
@@ -33,6 +33,7 @@
 import org.bukkit.Particle;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -178,5 +179,10 @@ public boolean equals(@Nullable Object o) {
 		VisualEffect that = (VisualEffect) o;
 		return type == that.type && Objects.equals(data, that.data);
 	}
+
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "visual effect"; // why is this a unique syntax element, it really needs to go
+	}
 	
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
index fa84e4cfa96..4f6b35ddc51 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
@@ -15,7 +15,7 @@
 /**
  * Stores the accumulated runtime errors over a span of time, then prints them.
  */
-public class Frame {
+public final class Frame {
 
 	/**
 	 * Store limits for the number of issues a frame can print per frame.
@@ -24,19 +24,19 @@ public class Frame {
 	 * @param lineTimeoutLimit the limit at which a line will be put in timeout for exceeding.
 	 * @param timeoutDuration the duration a line will stay in timeout, in frames.
 	 */
-	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) {}
+	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) { }
 
-	final static String plural = "s were";
-	final static String singular= " was";
+	private final static String plural = "s were";
+	private final static String singular= " was";
 
-	final String type;
-	final FrameLimit limits;
+	private final String type;
+	private final FrameLimit limits;
 
-	int skipped;
-	int printed;
-	Map<Node, Integer> lineTotals;
-	Map<Node, Integer> lineSkipped;
-	Map<Node, Integer> timeouts;
+	private int skipped;
+	private int printed;
+	private final Map<Node, Integer> lineTotals;
+	private final Map<Node, Integer> lineSkipped;
+	private final Map<Node, Integer> timeouts;
 
 	public Frame(String type, FrameLimit limits) {
 		this.type = type;
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
index ec3dc29cf09..1f2bb16588e 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
@@ -4,6 +4,7 @@
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
 import org.bukkit.Bukkit;
 import org.skriptlang.skript.lang.errors.Frame.FrameLimit;
@@ -49,7 +50,7 @@ public static void refresh() {
 	}
 
 	private final Frame errorFrame, warningFrame;
-	private final int taskId;
+	private final Task task;
 
 	/**
 	 * Creates a new error manager, which also creates its own frames.
@@ -63,13 +64,16 @@ public static void refresh() {
 	public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit warningLimits) {
 		errorFrame = new Frame("error", errorLimits);
 		warningFrame = new Frame("warning", warningLimits);
-		taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(Skript.getInstance(), () -> {
-			errorFrame.printFrame();
-			errorFrame.nextFrame();
-
-			warningFrame.printFrame();
-			warningFrame.nextFrame();
-		}, frameLength, frameLength);
+		task = new Task(Skript.getInstance(), frameLength, frameLength, true) {
+			@Override
+			public void run() {
+				errorFrame.printFrame();
+				errorFrame.nextFrame();
+
+				warningFrame.printFrame();
+				warningFrame.nextFrame();
+			}
+		};
 	}
 
 
@@ -97,6 +101,7 @@ public Frame getWarningFrame() {
 
 	@Override
 	public void close() {
-		Bukkit.getScheduler().cancelTask(taskId);
+		task.close();
 	}
+
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
index 4c63d29fa20..4866f3d6e74 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
@@ -4,10 +4,7 @@
 import ch.njol.skript.config.Config;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.doc.Name;
-import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Section;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SyntaxElement;
 import ch.njol.skript.lang.parser.ParserInstance;
@@ -16,7 +13,6 @@
 import ch.njol.util.Kleenean;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.skriptlang.skript.lang.structure.Structure;
 
 import java.util.logging.Level;
 
@@ -52,7 +48,7 @@ public interface RuntimeErrorProducer {
 	 *
 	 * @return The text to underline in the line that produced a runtime error.
 	 */
-	String toUnderline();
+	String toHighlight();
 
 	/**
 	 * Dispatches a runtime error with the given text.
@@ -64,7 +60,7 @@ public interface RuntimeErrorProducer {
 	 * @param message The text to display as the error message.
 	 */
 	default void error(String message) {
-		String formatted = toFormattedErrorString(Level.SEVERE, message, getNode(), toUnderline());
+		String formatted = toFormattedErrorString(Level.SEVERE, message, getNode(), toHighlight());
 		Skript.getRuntimeErrorManager().error(getNode(), formatted);
 	}
 
@@ -78,7 +74,7 @@ default void error(String message) {
 	 * @param message The text to display as the error message.
 	 */
 	default void warning(String message) {
-		String formatted = toFormattedErrorString(Level.WARNING, message, getNode(), toUnderline());
+		String formatted = toFormattedErrorString(Level.WARNING, message, getNode(), toHighlight());
 		Skript.getRuntimeErrorManager().warning(getNode(), formatted);
 	}
 
@@ -129,25 +125,16 @@ default void warning(String message) {
 		String from = this.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
 
 		return
-			String.format(skriptInfo, c.getFileName(), from, getSyntaxType()) +
+			String.format(skriptInfo, c.getFileName(), from, getSyntaxTypeName()) +
 			String.format(errorInfo, message.replaceAll("§", "&")) +
 			String.format(lineInfo, node.getLine(), node.save().trim().replaceAll("§", "&").replaceAll(toUnderline, "§f§n" + toUnderline + "§7"));
 	}
 
 	@Contract(pure = true)
-	private @NotNull String getSyntaxType() {
-		if (this instanceof Effect) {
-			return "effect";
-		} else if (this instanceof Condition) {
-			return "condition";
-		} else if (this instanceof Expression<?>) {
-			return "expression";
-		} else if (this instanceof Section) {
-			return "section";
-		} else if (this instanceof Structure) {
-			return "structure";
-		}
-		return "syntax";
+	private @NotNull String getSyntaxTypeName() {
+		if (this instanceof SyntaxElement syntaxElement)
+			return syntaxElement.getSyntaxTypeName();
+		return "unknown syntax type";
 	}
 
 	@Contract(pure = true)
diff --git a/src/main/java/org/skriptlang/skript/lang/structure/Structure.java b/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
index f56cffcfbf0..e2a854f4e24 100644
--- a/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
+++ b/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
@@ -195,6 +195,11 @@ public String toString() {
 		return toString(null, false);
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "structure";
+	}
+
 	@Nullable
 	public static Structure parse(String expr, Node node, @Nullable String defaultError) {
 		return parse(expr, node, defaultError, Skript.getStructures().iterator());

From 2d8fcd35ebbf8aa6623402bca7794ab9a6f9fc9b Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:35:33 -0500
Subject: [PATCH 09/16] Major refactor

Switch to REConsumer, create RE and ErrorSource classes, use new config reload event.
---
 src/main/java/ch/njol/skript/Skript.java      |   7 +-
 .../java/ch/njol/skript/SkriptCommand.java    |   9 +-
 src/main/java/ch/njol/skript/config/Node.java |  14 +-
 .../base/SimplePropertyExpression.java        |   2 +-
 .../lang/errors/RuntimeErrorProducer.java     | 145 ------------------
 .../skript/log/runtime/ErrorSource.java       |  49 ++++++
 .../{lang/errors => log/runtime}/Frame.java   |  80 +++++-----
 .../skript/log/runtime/RuntimeError.java      |  54 +++++++
 .../log/runtime/RuntimeErrorConsumer.java     |  12 ++
 .../runtime}/RuntimeErrorManager.java         |  42 +++--
 .../log/runtime/RuntimeErrorProducer.java     |  91 +++++++++++
 11 files changed, 287 insertions(+), 218 deletions(-)
 delete mode 100644 src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
 create mode 100644 src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
 rename src/main/java/org/skriptlang/skript/{lang/errors => log/runtime}/Frame.java (50%)
 create mode 100644 src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
 create mode 100644 src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
 rename src/main/java/org/skriptlang/skript/{lang/errors => log/runtime}/RuntimeErrorManager.java (71%)
 create mode 100644 src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 6fc24a99a4a..0f3e22fb196 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -107,7 +107,7 @@
 import org.skriptlang.skript.lang.converter.Converter;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.lang.entry.EntryValidator;
-import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
+import org.skriptlang.skript.log.runtime.RuntimeErrorManager;
 import org.skriptlang.skript.lang.experiment.ExperimentRegistry;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
@@ -512,6 +512,9 @@ public void onEnable() {
 			}
 		}
 
+		// Register config load events.
+		SkriptConfig.eventRegistry().register(SkriptConfig.ReloadEvent.class, RuntimeErrorManager::refresh);
+
 		// Config must be loaded after Java and Skript classes are parseable
 		// ... but also before platform check, because there is a config option to ignore some errors
 		SkriptConfig.load();
@@ -568,8 +571,6 @@ public void onEnable() {
 
 		Commands.registerListeners();
 
-		RuntimeErrorManager.refresh();
-
 		if (logNormal())
 			info(" " + Language.get("skript.copyright"));
 
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 6d83e966cf8..795b00e64ea 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -45,17 +45,12 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
 import org.skriptlang.skript.lang.script.Script;
 
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -159,7 +154,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				if (args[1].equalsIgnoreCase("all")) {
 					reloading(sender, "config, aliases and scripts", logHandler);
 					SkriptConfig.load();
-					RuntimeErrorManager.refresh();
 					Aliases.clear();
 					Aliases.loadAsync().thenRun(() -> {
 						ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
@@ -183,7 +177,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				} else if (args[1].equalsIgnoreCase("config")) {
 					reloading(sender, "main config", logHandler);
 					SkriptConfig.load();
-					RuntimeErrorManager.refresh();
 					reloaded(sender, logHandler, timingLogHandler, "main config");
 				} else if (args[1].equalsIgnoreCase("aliases")) {
 					reloading(sender, "aliases", logHandler);
diff --git a/src/main/java/ch/njol/skript/config/Node.java b/src/main/java/ch/njol/skript/config/Node.java
index 65504aa5526..64f636e8502 100644
--- a/src/main/java/ch/njol/skript/config/Node.java
+++ b/src/main/java/ch/njol/skript/config/Node.java
@@ -18,18 +18,14 @@
  */
 package ch.njol.skript.config;
 
-import java.io.PrintWriter;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import ch.njol.skript.SkriptConfig;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.StringUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.PrintWriter;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Peter Güttinger
@@ -94,7 +90,7 @@ protected Node(final String key, final String comment, final SectionNode parent,
 	public String getKey() {
 		return key;
 	}
-	
+
 	public final Config getConfig() {
 		return config;
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index ebdbf18e40f..7930e2ebfe9 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -8,7 +8,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.errors.RuntimeErrorProducer;
+import org.skriptlang.skript.log.runtime.RuntimeErrorProducer;
 
 /**
  * A base class for property expressions that requires only few overridden methods
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
deleted file mode 100644
index 4866f3d6e74..00000000000
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorProducer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.skriptlang.skript.lang.errors;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.config.Config;
-import ch.njol.skript.config.Node;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.SyntaxElement;
-import ch.njol.skript.lang.parser.ParserInstance;
-import ch.njol.skript.localization.ArgsMessage;
-import ch.njol.skript.util.Utils;
-import ch.njol.util.Kleenean;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Level;
-
-/**
- * A RuntimeErrorProducer can throw runtime errors in a standardized and controlled manner.
- * Only {@link SyntaxElement}s are intended to implement this interface.
- */
-public interface RuntimeErrorProducer {
-
-	// todo: try/catch, suppression when annotations are added
-
-	/**
-	 * Returns the {@link Node} that this is a part of. Used for accessing the line contents via {@link Node#getKey()}
-	 * and the line number via {@link Node#getLine()}.
-	 * <br>
-	 * A standard implementation is to store the Node during
-	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
-	 * via {@link ParserInstance#getNode()}.
-	 * @return The node that produced a runtime error.
-	 */
-	Node getNode();
-
-	/**
-	 * Gets the text that should be underlined within the line contents. This should match the text the user wrote that
-	 * was parsed as the syntax that threw the runtime issue. For example, if the skull expression in
-	 * {@code give skull of player to all players} throws a runtime error, this method should return
-	 * {@code "skull of player"}
-	 * <br>
-	 * An example implementation for {@link Expression}s is to store {@link SkriptParser.ParseResult#expr} during
-	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)} and return that.
-	 * <br>
-	 * For other syntax types, this may vary. Effects, for example, may underline the whole line.
-	 *
-	 * @return The text to underline in the line that produced a runtime error.
-	 */
-	String toHighlight();
-
-	/**
-	 * Dispatches a runtime error with the given text.
-	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
-	 * and the line content.
-	 * <br>
-	 * Implementations should ensure they call super() to print the error.
-	 *
-	 * @param message The text to display as the error message.
-	 */
-	default void error(String message) {
-		String formatted = toFormattedErrorString(Level.SEVERE, message, getNode(), toHighlight());
-		Skript.getRuntimeErrorManager().error(getNode(), formatted);
-	}
-
-	/**
-	 * Dispatches a runtime warning with the given text.
-	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
-	 * and the line content.
-	 * <br>
-	 * Implementations should ensure they call super() to print the warning.
-	 *
-	 * @param message The text to display as the error message.
-	 */
-	default void warning(String message) {
-		String formatted = toFormattedErrorString(Level.WARNING, message, getNode(), toHighlight());
-		Skript.getRuntimeErrorManager().warning(getNode(), formatted);
-	}
-
-	String CONFIG_NODE = "skript command.reload";
-	ArgsMessage WARNING_DETAILS = new ArgsMessage(CONFIG_NODE + ".warning details");
-	ArgsMessage ERROR_DETAILS = new ArgsMessage(CONFIG_NODE + ".error details");
-	ArgsMessage OTHER_DETAILS = new ArgsMessage(CONFIG_NODE + ".other details");
-	ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.error");
-	ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.warning");
-	ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.line info");
-
-	/**
-	 * Generates a formatted string based on the provided log level, message, node information, and text to underline.
-	 *
-	 * @param level The severity level of the log message.
-	 * @param message The message to be included in the log.
-	 * @param node The node associated with this log message.
-	 * @param toUnderline The text in the node's line content that should be underlined in the log message.
-	 * @return A formatted string that includes metadata such as the script filename, error message,
-	 * 			and the specific line that caused the error.
-	 */
-	private @NotNull String toFormattedErrorString(@NotNull Level level, String message, Node node, String toUnderline) {
-		// Replace configured messages chat styles without user variables
-		// todo: add lang entries, handle error vs warning
-
-
-		ArgsMessage details;
-		ArgsMessage info;
-		if (level.intValue() == Level.WARNING.intValue()) { // warnings
-			details = WARNING_DETAILS;
-			info = WARNING_INFO;
-		} else if (level.intValue() == Level.SEVERE.intValue()) { // errors
-			details = ERROR_DETAILS;
-			info = ERROR_INFO;
-		} else { // anything else
-			details = OTHER_DETAILS;
-			info = WARNING_INFO;
-		}
-
-		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
-		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
-		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
-
-		if (node == null)
-			return "effect command produced error"; // TODO
-
-		Config c = node.getConfig();
-		String from = this.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
-
-		return
-			String.format(skriptInfo, c.getFileName(), from, getSyntaxTypeName()) +
-			String.format(errorInfo, message.replaceAll("§", "&")) +
-			String.format(lineInfo, node.getLine(), node.save().trim().replaceAll("§", "&").replaceAll(toUnderline, "§f§n" + toUnderline + "§7"));
-	}
-
-	@Contract(pure = true)
-	private @NotNull String getSyntaxTypeName() {
-		if (this instanceof SyntaxElement syntaxElement)
-			return syntaxElement.getSyntaxTypeName();
-		return "unknown syntax type";
-	}
-
-	@Contract(pure = true)
-	private @NotNull String replaceNewline(@NotNull String s) {
-		return s.replaceAll("\\\\n", "\n");
-	}
-
-}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
new file mode 100644
index 00000000000..202679cc312
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
@@ -0,0 +1,49 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.lang.SyntaxElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A more versatile set of information about the source of an error.
+ * Aims to avoid relying specifically on {@link Node}s for information.
+ * <br>
+ * Hashing is specifically based on line number and script name alone.
+ *
+ * @param syntaxType A string representing the type of syntax. See {@link SyntaxElement#getSyntaxTypeName()}.
+ * @param syntaxName The name of the syntax emitting the error.
+ * @param lineNumber The line number of the syntax emitting the error.
+ * @param lineText The raw code of the line.
+ * @param script The name of the script in which the line exists.
+ */
+public record ErrorSource(
+	String syntaxType,
+	String syntaxName,
+	int lineNumber,
+	String lineText,
+	String script
+) {
+
+	/**
+	 * Creates an error source using information from a given node and syntax element.
+	 * @param node The node to use for line, line number, and script name.
+	 * @param element The element to use for the type and name.
+	 * @return A new error source.
+	 */
+	public static @NotNull ErrorSource fromNodeAndElement(@Nullable Node node, @NotNull SyntaxElement element) {
+		String elementName = element.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
+		if (node == null) {
+			return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-effect command-");
+		}
+		String code = node.save().trim().replaceAll("§", "&");
+		return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
+	}
+
+	@Override
+	public int hashCode() {
+		return 13 * lineNumber + 17 * script.hashCode();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
similarity index 50%
rename from src/main/java/org/skriptlang/skript/lang/errors/Frame.java
rename to src/main/java/org/skriptlang/skript/log/runtime/Frame.java
index 4f6b35ddc51..6f021fb15d4 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/Frame.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
@@ -1,14 +1,10 @@
-package org.skriptlang.skript.lang.errors;
+package org.skriptlang.skript.log.runtime;
 
-import ch.njol.skript.config.Node;
-import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -26,6 +22,14 @@ public final class Frame {
 	 */
 	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) { }
 
+	/**
+	 * Stores outputs of a frame. Unused values will be empty strings or empty lists.
+	 * @param notDisplayed The text detailing what errors were not displayed.
+	 * @param timeouts A list of strings that detail which sources were put in timeout.
+	 * @param notification A string used to notify admins of runtime errors.
+	 */
+	public record FrameOutput(String notDisplayed, List<String> timeouts, String notification) { }
+
 	private final static String plural = "s were";
 	private final static String singular= " was";
 
@@ -34,9 +38,9 @@ public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, in
 
 	private int skipped;
 	private int printed;
-	private final Map<Node, Integer> lineTotals;
-	private final Map<Node, Integer> lineSkipped;
-	private final Map<Node, Integer> timeouts;
+	private final Map<ErrorSource, Integer> lineTotals;
+	private final Map<ErrorSource, Integer> lineSkipped;
+	private final Map<ErrorSource, Integer> timeouts;
 
 	public Frame(String type, FrameLimit limits) {
 		this.type = type;
@@ -46,14 +50,15 @@ public Frame(String type, FrameLimit limits) {
 		timeouts = new ConcurrentHashMap<>();
 	}
 
-	boolean add(Node node) {
+	public boolean add(@NotNull RuntimeError error) {
+		ErrorSource source = error.source();
 		// increment counter
-		int lineTotal = lineTotals.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+		int lineTotal = lineTotals.compute(source, (key, count) -> (count == null ? 1 : count + 1));
 
 		// don't print if in timeout
-		if (timeouts.containsKey(node)) {
+		if (timeouts.containsKey(source)) {
 			skipped++;
-			lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+			lineSkipped.compute(source, (key, count) -> (count == null ? 1 : count + 1));
 			return false;
 		}
 
@@ -63,21 +68,21 @@ boolean add(Node node) {
 			return true;
 		} else {
 			skipped++;
-			lineSkipped.compute(node, (key, count) -> (count == null ? 1 : count + 1));
+			lineSkipped.compute(source, (key, count) -> (count == null ? 1 : count + 1));
 			if (lineTotal == limits.lineTimeoutLimit) {
-				timeouts.put(node, limits.timeoutDuration);
+				timeouts.put(source, limits.timeoutDuration);
 			}
 			return false;
 		}
 	}
 
-	void nextFrame() {
+	public void nextFrame() {
 		skipped = 0;
 		printed = 0;
 		lineTotals.clear();
 		lineSkipped.clear();
-		for (Iterator<Map.Entry<Node, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
-			Map.Entry<Node, Integer> entry = it.next();
+		for (Iterator<Map.Entry<ErrorSource, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<ErrorSource, Integer> entry = it.next();
 			if (entry.getValue() > 0)
 				entry.setValue(entry.getValue() - 1);
 			else
@@ -85,45 +90,46 @@ void nextFrame() {
 		}
 	}
 
-	void printFrame() {
+	@Contract(" -> new")
+	public @NotNull FrameOutput printFrame() {
+		String skippedText = "";
 		if (skipped > 0) {
 			String linesNotDisplayed = lineSkipped.entrySet().stream()
-				.map(entry -> "'"+ entry.getKey().getConfig().getFileName() + "' line " + entry.getKey().getLine() + " (" + entry.getValue() + ")")
+				.map(entry -> "'"+ entry.getKey().script() + "' line " + entry.getKey().lineNumber() + " (" + entry.getValue() + ")")
 				.collect(Collectors.joining(", "));
 
-			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
+			skippedText = Utils.replaceEnglishChatStyles(
 				"<gold>" + (skipped) + "<light red> runtime " + type + (skipped > 1 ? plural : singular) +
 					" thrown in the last second but not displayed. From: " +
-					"<gray>" + linesNotDisplayed + "\n \n"));
+					"<gray>" + linesNotDisplayed + "\n \n");
 		}
 
-		for (Map.Entry<Node, Integer> entry : timeouts.entrySet()) {
+		List<String> timeoutTexts  = new ArrayList<>();
+		for (Map.Entry<ErrorSource, Integer> entry : timeouts.entrySet()) {
 			if (entry.getValue() == limits.timeoutDuration) {
-				Node node = entry.getKey();
-				SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), Utils.replaceEnglishChatStyles(
-					"<gold>Line " + node.getLine() + "<light red> of script '<gray>" + node.getConfig().getFileName() +
+				ErrorSource source = entry.getKey();
+				timeoutTexts.add(Utils.replaceEnglishChatStyles(
+					"<gold>Line " + source.lineNumber() + "<light red> of script '<gray>" + source.script() +
 						"<light red>' produced too many runtime errors (<gray>" + limits.lineTimeoutLimit +
 						"<light red> allowed per second). No errors from this line will be printed for " + limits.timeoutDuration + " frames.\n \n"));
 			}
 		}
 
+		String notification = "";
 		if (printed > 0) {
 			// get various scripts from nodes
 			Set<String> scripts = lineTotals.keySet().stream()
-				.map((node) -> node.getConfig().getFileName())
+				.map(ErrorSource::script)
 				.collect(Collectors.toSet());
-			String message = "<light red>Script '<gray>" + scripts.iterator().next();
+			notification = "<light red>Script '<gray>" + scripts.iterator().next();
 			if (scripts.size() > 1) {
-				message += "<light red>' and " + (scripts.size() - 1) + " others";
-			}
-			message += "<light red> produced runtime errors. Please check console logs for details.";
-
-			for (Player player : Bukkit.getOnlinePlayers()) {
-				if (player.hasPermission(RuntimeErrorManager.ERROR_NOTIF_PERMISSION))
-					SkriptLogger.sendFormatted(player, message);
+				notification += "<light red>' and " + (scripts.size() - 1) + " others";
 			}
+			notification += "<light red> produced runtime errors. Please check console logs for details.";
 		}
 
+		return new FrameOutput(skippedText, timeoutTexts, notification);
+
 	}
 
 }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
new file mode 100644
index 00000000000..53fd44f0169
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
@@ -0,0 +1,54 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.localization.ArgsMessage;
+import ch.njol.skript.util.Utils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.logging.Level;
+
+public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) {
+
+	private static final String CONFIG_NODE = "skript command.reload";
+	private static final ArgsMessage WARNING_DETAILS = new ArgsMessage(CONFIG_NODE + ".warning details");
+	private static final ArgsMessage ERROR_DETAILS = new ArgsMessage(CONFIG_NODE + ".error details");
+	private static final ArgsMessage OTHER_DETAILS = new ArgsMessage(CONFIG_NODE + ".other details");
+	private static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.error");
+	private static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.warning");
+	private static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.line info");
+
+	/**
+	 * @return A formatted string that includes the error as well as any relevant metadata from the source.
+	 */
+	public @NotNull String toFormattedString() {
+		ArgsMessage details;
+		ArgsMessage info;
+		if (level.intValue() == Level.WARNING.intValue()) { // warnings
+			details = WARNING_DETAILS;
+			info = WARNING_INFO;
+		} else if (level.intValue() == Level.SEVERE.intValue()) { // errors
+			details = ERROR_DETAILS;
+			info = ERROR_INFO;
+		} else { // anything else
+			details = OTHER_DETAILS;
+			info = WARNING_INFO;
+		}
+
+		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
+		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
+
+		String code = source.lineText();
+		if (toHighlight != null)
+			code = code.replaceAll(toHighlight, "§f§n" + toHighlight + "§7");
+
+		return String.format(skriptInfo, source.script(), source.syntaxName(), source.syntaxType()) +
+			String.format(errorInfo, error.replaceAll("§", "&")) +
+			String.format(lineInfo, source.lineNumber(), code);
+	}
+
+	private static @NotNull String replaceNewline(@NotNull String s) {
+		return s.replaceAll("\\\\n", "\n");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
new file mode 100644
index 00000000000..0c1064713d2
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
@@ -0,0 +1,12 @@
+package org.skriptlang.skript.log.runtime;
+
+/**
+ * Consumes runtime errors. Some use cases include printing errors to console or redirecting to a Discord channel.
+ */
+public interface RuntimeErrorConsumer {
+
+	void printError(RuntimeError error);
+
+	void printFrameOutput(Frame.FrameOutput output);
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
similarity index 71%
rename from src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
rename to src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
index 1f2bb16588e..04e1d574721 100644
--- a/src/main/java/org/skriptlang/skript/lang/errors/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -1,15 +1,14 @@
-package org.skriptlang.skript.lang.errors;
+package org.skriptlang.skript.log.runtime;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptConfig;
-import ch.njol.skript.config.Node;
-import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
-import org.bukkit.Bukkit;
-import org.skriptlang.skript.lang.errors.Frame.FrameLimit;
+import org.skriptlang.skript.log.runtime.Frame.FrameLimit;
 
 import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Handles duplicate and spammed runtime errors.
@@ -44,14 +43,20 @@ public static void refresh() {
 		int warningTimeoutLength = Math.max(SkriptConfig.runtimeWarningTimeoutDuration.value(), 1);
 		FrameLimit warningFrame = new FrameLimit(warningLimit, warningLineLimit, warningLineTimeout, warningTimeoutLength);
 
-		if (instance != null)
+		List<RuntimeErrorConsumer> oldConsumers = List.of();
+		if (instance != null) {
 			instance.close();
+			oldConsumers = instance.consumers;
+		}
 		instance = new RuntimeErrorManager(Math.max((int) frameLength, 1), errorFrame, warningFrame);
+		oldConsumers.forEach(consumer -> instance.addConsumer(consumer));
 	}
 
 	private final Frame errorFrame, warningFrame;
 	private final Task task;
 
+	private final List<RuntimeErrorConsumer> consumers = new ArrayList<>();
+
 	/**
 	 * Creates a new error manager, which also creates its own frames.
 	 * <br>
@@ -67,27 +72,26 @@ public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit w
 		task = new Task(Skript.getInstance(), frameLength, frameLength, true) {
 			@Override
 			public void run() {
-				errorFrame.printFrame();
+				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.printFrame()));
 				errorFrame.nextFrame();
 
-				warningFrame.printFrame();
+				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.printFrame()));
 				warningFrame.nextFrame();
 			}
 		};
 	}
 
-
-	void error(Node node, String message) {
+	public void error(RuntimeError error) {
 		// print if < limit
-		if (errorFrame.add(node)) {
-			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
+		if (errorFrame.add(error)) {
+			consumers.forEach((consumer -> consumer.printError(error)));
 		}
 	}
 
-	void warning(Node node, String message){
+	public void warning(RuntimeError error){
 		// print if < limit
-		if (warningFrame.add(node)) {
-			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(), message);
+		if (warningFrame.add(error)) {
+			consumers.forEach((consumer -> consumer.printError(error)));
 		}
 	}
 
@@ -99,6 +103,14 @@ public Frame getWarningFrame() {
 		return warningFrame;
 	}
 
+	public void addConsumer(RuntimeErrorConsumer consumer) {
+		consumers.add(consumer);
+	}
+
+	public void removeConsumer(RuntimeErrorConsumer consumer) {
+		consumers.remove(consumer);
+	}
+
 	@Override
 	public void close() {
 		task.close();
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
new file mode 100644
index 00000000000..60bf5a65b12
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
@@ -0,0 +1,91 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.logging.Level;
+
+/**
+ * A RuntimeErrorProducer can throw runtime errors in a standardized and controlled manner.
+ * Only {@link SyntaxElement}s are intended to implement this interface.
+ */
+public interface RuntimeErrorProducer {
+
+	// todo: try/catch, suppression when annotations are added
+
+	/**
+	 * Returns the source {@link Node} for any errors the implementing class emits.
+	 * <br>
+	 * Used for accessing the line contents via {@link Node#getKey()}
+	 * and the line number via {@link Node#getLine()}.
+	 * <br>
+	 * A standard implementation is to store the Node during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
+	 * via {@link ParserInstance#getNode()}.
+	 * @return The source that produced a runtime error.
+	 */
+	Node getNode();
+
+	/**
+	 * @return A source composed of the implementing {@link SyntaxElement} and the result of {@link #getNode()}
+	 */
+	@Contract(" -> new")
+	private @NotNull ErrorSource getErrorSource() {
+		return ErrorSource.fromNodeAndElement(getNode(), (SyntaxElement) this);
+	}
+
+	/**
+	 * Gets the text that should be underlined within the line contents. This should match the text the user wrote that
+	 * was parsed as the syntax that threw the runtime issue. For example, if the skull expression in
+	 * {@code give skull of player to all players} throws a runtime error, this method should return
+	 * {@code "skull of player"}
+	 * <br>
+	 * An example implementation for {@link Expression}s is to store {@link SkriptParser.ParseResult#expr} during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)} and return that.
+	 * <br>
+	 * For other syntax types, this may vary. Effects, for example, may underline the whole line.
+	 *
+	 * @return The text to underline in the line that produced a runtime error. This may be null if no highlighting
+	 * 			is desired or possible.
+	 */
+	@Nullable String toHighlight();
+
+	/**
+	 * Dispatches a runtime error with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the error.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void error(String message) {
+		Skript.getRuntimeErrorManager().error(
+			new RuntimeError(Level.SEVERE, getErrorSource(), message, toHighlight())
+		);
+	}
+
+	/**
+	 * Dispatches a runtime warning with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the warning.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void warning(String message) {
+		Skript.getRuntimeErrorManager().warning(
+			new RuntimeError(Level.WARNING, getErrorSource(), message, toHighlight())
+		);
+	}
+
+}

From 9b4cc68c16194ba17693d9be34f4367a0aaa1ab5 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:51:40 -0500
Subject: [PATCH 10/16] Finish requested changes

---
 src/main/java/ch/njol/skript/Skript.java      |  10 +-
 .../runtime/BukkitRuntimeErrorConsumer.java   | 128 ++++++++++++++++++
 .../skript/log/runtime/ErrorSource.java       |  19 ++-
 .../skriptlang/skript/log/runtime/Frame.java  | 100 +++++---------
 .../skript/log/runtime/RuntimeError.java      |  49 +------
 .../log/runtime/RuntimeErrorConsumer.java     |  13 +-
 .../log/runtime/RuntimeErrorManager.java      |  20 +--
 src/main/resources/lang/english.lang          |  24 +++-
 8 files changed, 235 insertions(+), 128 deletions(-)
 create mode 100644 src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 0f3e22fb196..e1af7ba31a7 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -102,6 +102,7 @@
 import org.skriptlang.skript.bukkit.breeding.BreedingModule;
 import org.skriptlang.skript.bukkit.displays.DisplayModule;
 import org.skriptlang.skript.bukkit.input.InputModule;
+import org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer;
 import org.skriptlang.skript.lang.comparator.Comparator;
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.converter.Converter;
@@ -512,13 +513,18 @@ public void onEnable() {
 			}
 		}
 
-		// Register config load events.
-		SkriptConfig.eventRegistry().register(SkriptConfig.ReloadEvent.class, RuntimeErrorManager::refresh);
 
 		// Config must be loaded after Java and Skript classes are parseable
 		// ... but also before platform check, because there is a config option to ignore some errors
 		SkriptConfig.load();
 
+		// Register the runtime error refresh after loading, so we can do the first instantiation manually.
+		SkriptConfig.eventRegistry().register(SkriptConfig.ReloadEvent.class, RuntimeErrorManager::refresh);
+
+		// init runtime error manager and add bukkit consumer.
+		RuntimeErrorManager.refresh();
+		RuntimeErrorManager.getInstance().addConsumer(new BukkitRuntimeErrorConsumer());
+
 		CompletableFuture<Boolean> aliases = Aliases.loadAsync();
 
 		// Now override the verbosity if test mode is enabled
diff --git a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
new file mode 100644
index 00000000000..e1a22f8f905
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
@@ -0,0 +1,128 @@
+package org.skriptlang.skript.bukkit.log.runtime;
+
+import ch.njol.skript.localization.ArgsMessage;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.log.runtime.ErrorSource;
+import org.skriptlang.skript.log.runtime.ErrorSource.Location;
+import org.skriptlang.skript.log.runtime.Frame.FrameOutput;
+import org.skriptlang.skript.log.runtime.RuntimeError;
+import org.skriptlang.skript.log.runtime.RuntimeErrorConsumer;
+
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+/**
+ * An implementation for Bukkit based platforms.
+ * Sends errors to console with formatted colours and a notification chat message to
+ * users with the see_runtime_errors permission.
+ */
+public class BukkitRuntimeErrorConsumer implements RuntimeErrorConsumer {
+
+	public final static String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
+
+	public static final ArgsMessage ERROR_SKIPPED = new ArgsMessage(RuntimeError.CONFIG_NODE + ".errors skipped");
+	public static final ArgsMessage ERROR_TIMEOUT = new ArgsMessage(RuntimeError.CONFIG_NODE + ".errors timed out");
+	public static final ArgsMessage ERROR_NOTIF = new ArgsMessage(RuntimeError.CONFIG_NODE + ".error notification");
+	public static final ArgsMessage ERROR_NOTIF_PLURAL = new ArgsMessage(RuntimeError.CONFIG_NODE + ".error notification plural");
+
+	public static final ArgsMessage WARNING_SKIPPED = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warnings skipped");
+	public static final ArgsMessage WARNING_TIMEOUT = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warnings timed out");
+	public static final ArgsMessage WARNING_NOTIF = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warning notification");
+	public static final ArgsMessage WARNING_NOTIF_PLURAL = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warning notification plural");
+
+	@Override
+	public void printError(@NotNull RuntimeError error) {
+		ArgsMessage details;
+		ArgsMessage info;
+		if (error.level().intValue() == Level.WARNING.intValue()) { // warnings
+			details = RuntimeError.WARNING_DETAILS;
+			info = RuntimeError.WARNING_INFO;
+		} else if (error.level().intValue() == Level.SEVERE.intValue()) { // errors
+			details = RuntimeError.ERROR_DETAILS;
+			info = RuntimeError.ERROR_INFO;
+		} else { // anything else
+			details = RuntimeError.OTHER_DETAILS;
+			info = RuntimeError.WARNING_INFO;
+		}
+
+		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
+		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(
+				RuntimeError.LINE_INFO.getValue() == null ? RuntimeError.LINE_INFO.key : RuntimeError.LINE_INFO.getValue()));
+
+		ErrorSource source = error.source();
+		String code = source.lineText();
+		if (error.toHighlight() != null && !error.toHighlight().isEmpty())
+			code = code.replace(error.toHighlight(), "§f§n" + error.toHighlight() + "§7");
+
+		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				String.format(skriptInfo, source.script(), source.syntaxName(), source.syntaxType()) +
+				String.format(errorInfo, error.error().replace("§", "&")) +
+				String.format(lineInfo, source.lineNumber(), code));
+	}
+
+	@Override
+	public void printFrameOutput(@NotNull FrameOutput output, Level level) {
+
+		if (!output.skippedErrors().isEmpty()) {
+			String linesNotDisplayed = output.skippedErrors().entrySet().stream()
+				.map(entry -> "'"+ entry.getKey().script() + "' line " + entry.getKey().lineNumber() + " (" + entry.getValue() + ")")
+				.collect(Collectors.joining(", "));
+
+			int skipped = output.skippedErrors().values().stream().reduce(0, Integer::sum);
+
+			ArgsMessage message = level == Level.SEVERE ? ERROR_SKIPPED : WARNING_SKIPPED;
+			String line = message.getValue() != null ? message.getValue() : message.key;
+
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				Utils.replaceEnglishChatStyles(
+					String.format(line, skipped, linesNotDisplayed)
+				)
+			);
+		}
+
+		ArgsMessage message = level == Level.SEVERE ? ERROR_TIMEOUT : WARNING_TIMEOUT;
+		String timeoutLine = message.getValue() != null ? message.getValue() : message.key;
+		for (Location location : output.newTimeouts()) {
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				Utils.replaceEnglishChatStyles(
+					String.format(timeoutLine, location.lineNumber(), location.script(),
+							output.frameLimits().lineTimeoutLimit(), output.frameLimits().timeoutDuration())
+				)
+			);
+		}
+
+		if (!output.totalErrors().isEmpty()) {
+			ArgsMessage notification;
+			// get various scripts from nodes
+			Set<String> scripts = output.totalErrors().keySet().stream()
+				.map(Location::script)
+				.collect(Collectors.toSet());
+			notification = level == Level.SEVERE ? ERROR_NOTIF : WARNING_NOTIF;
+			if (scripts.size() > 1) {
+				notification = level == Level.SEVERE ? ERROR_NOTIF_PLURAL : WARNING_NOTIF_PLURAL;
+			}
+
+			String notif = notification.getValue() != null ? notification.getValue() : notification.key;
+			for (Player player : Bukkit.getOnlinePlayers()) {
+				if (player.hasPermission(ERROR_NOTIF_PERMISSION)) {
+					SkriptLogger.sendFormatted(player,
+						Utils.replaceEnglishChatStyles(
+							String.format(notif, scripts.iterator().next(), scripts.size() - 1)
+						)
+					);
+				}
+			}
+		}
+	}
+
+	private static @NotNull String replaceNewline(@NotNull String s) {
+		return s.replaceAll("\\\\n", "\n");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
index 202679cc312..1bb5a7a8357 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
@@ -3,14 +3,13 @@
 import ch.njol.skript.config.Node;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.lang.SyntaxElement;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * A more versatile set of information about the source of an error.
  * Aims to avoid relying specifically on {@link Node}s for information.
- * <br>
- * Hashing is specifically based on line number and script name alone.
  *
  * @param syntaxType A string representing the type of syntax. See {@link SyntaxElement#getSyntaxTypeName()}.
  * @param syntaxName The name of the syntax emitting the error.
@@ -41,9 +40,19 @@ public record ErrorSource(
 		return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
 	}
 
-	@Override
-	public int hashCode() {
-		return 13 * lineNumber + 17 * script.hashCode();
+	/**
+	 * @return The code location (line number and script name) of the source of the error.
+	 *         Used for hash maps.
+	 */
+	@Contract(" -> new")
+	public @NotNull Location location() {
+		return new Location(script, lineNumber);
 	}
 
+	/**
+	 * A code location (line number and script name).
+	 * Used for hash maps.
+	 */
+	public record Location(String script, int lineNumber) { }
+
 }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/Frame.java b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
index 6f021fb15d4..050eafd04a6 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
@@ -1,12 +1,12 @@
 package org.skriptlang.skript.log.runtime;
 
-import ch.njol.skript.util.Utils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnmodifiableView;
+import org.skriptlang.skript.log.runtime.ErrorSource.Location;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 /**
  * Stores the accumulated runtime errors over a span of time, then prints them.
@@ -23,27 +23,27 @@ public final class Frame {
 	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) { }
 
 	/**
-	 * Stores outputs of a frame. Unused values will be empty strings or empty lists.
-	 * @param notDisplayed The text detailing what errors were not displayed.
-	 * @param timeouts A list of strings that detail which sources were put in timeout.
-	 * @param notification A string used to notify admins of runtime errors.
+	 * Stores outputs of a frame.
+	 * @param totalErrors A map of error locations to number of errors produced for this frame.
+	 * @param skippedErrors A map of error locations to number of errors not printed for this frame.
+	 * @param newTimeouts A set of error locations that were timed out this frame.
+	 * @param frameLimits The limits this frame is using.
 	 */
-	public record FrameOutput(String notDisplayed, List<String> timeouts, String notification) { }
+	public record FrameOutput(
+		@UnmodifiableView Map<Location, Integer> totalErrors,
+		@UnmodifiableView Map<Location, Integer> skippedErrors,
+		@UnmodifiableView Set<Location> newTimeouts,
+		FrameLimit frameLimits
+	) { }
 
-	private final static String plural = "s were";
-	private final static String singular= " was";
-
-	private final String type;
 	private final FrameLimit limits;
 
-	private int skipped;
 	private int printed;
-	private final Map<ErrorSource, Integer> lineTotals;
-	private final Map<ErrorSource, Integer> lineSkipped;
-	private final Map<ErrorSource, Integer> timeouts;
+	private final Map<Location, Integer> lineTotals;
+	private final Map<Location, Integer> lineSkipped;
+	private final Map<Location, Integer> timeouts;
 
-	public Frame(String type, FrameLimit limits) {
-		this.type = type;
+	public Frame(FrameLimit limits) {
 		this.limits = limits;
 		lineTotals = new ConcurrentHashMap<>();
 		lineSkipped = new ConcurrentHashMap<>();
@@ -51,14 +51,13 @@ public Frame(String type, FrameLimit limits) {
 	}
 
 	public boolean add(@NotNull RuntimeError error) {
-		ErrorSource source = error.source();
+		Location location = error.source().location();
 		// increment counter
-		int lineTotal = lineTotals.compute(source, (key, count) -> (count == null ? 1 : count + 1));
+		int lineTotal = lineTotals.compute(location, (key, count) -> (count == null ? 1 : count + 1));
 
 		// don't print if in timeout
-		if (timeouts.containsKey(source)) {
-			skipped++;
-			lineSkipped.compute(source, (key, count) -> (count == null ? 1 : count + 1));
+		if (timeouts.containsKey(location)) {
+			lineSkipped.compute(location, (key, count) -> (count == null ? 1 : count + 1));
 			return false;
 		}
 
@@ -67,69 +66,42 @@ public boolean add(@NotNull RuntimeError error) {
 			printed++;
 			return true;
 		} else {
-			skipped++;
-			lineSkipped.compute(source, (key, count) -> (count == null ? 1 : count + 1));
+			lineSkipped.compute(location, (key, count) -> (count == null ? 1 : count + 1));
 			if (lineTotal == limits.lineTimeoutLimit) {
-				timeouts.put(source, limits.timeoutDuration);
+				timeouts.put(location, limits.timeoutDuration);
 			}
 			return false;
 		}
 	}
 
 	public void nextFrame() {
-		skipped = 0;
 		printed = 0;
 		lineTotals.clear();
 		lineSkipped.clear();
-		for (Iterator<Map.Entry<ErrorSource, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
-			Map.Entry<ErrorSource, Integer> entry = it.next();
-			if (entry.getValue() > 0)
+		for (Iterator<Map.Entry<Location, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<Location, Integer> entry = it.next();
+			if (entry.getValue() > 0) {
 				entry.setValue(entry.getValue() - 1);
-			else
+			} else {
 				it.remove();
+			}
 		}
 	}
 
 	@Contract(" -> new")
 	public @NotNull FrameOutput printFrame() {
-		String skippedText = "";
-		if (skipped > 0) {
-			String linesNotDisplayed = lineSkipped.entrySet().stream()
-				.map(entry -> "'"+ entry.getKey().script() + "' line " + entry.getKey().lineNumber() + " (" + entry.getValue() + ")")
-				.collect(Collectors.joining(", "));
-
-			skippedText = Utils.replaceEnglishChatStyles(
-				"<gold>" + (skipped) + "<light red> runtime " + type + (skipped > 1 ? plural : singular) +
-					" thrown in the last second but not displayed. From: " +
-					"<gray>" + linesNotDisplayed + "\n \n");
-		}
-
-		List<String> timeoutTexts  = new ArrayList<>();
-		for (Map.Entry<ErrorSource, Integer> entry : timeouts.entrySet()) {
+		Set<Location> newTimeouts = new HashSet<>();
+		for (Map.Entry<Location, Integer> entry : timeouts.entrySet()) {
 			if (entry.getValue() == limits.timeoutDuration) {
-				ErrorSource source = entry.getKey();
-				timeoutTexts.add(Utils.replaceEnglishChatStyles(
-					"<gold>Line " + source.lineNumber() + "<light red> of script '<gray>" + source.script() +
-						"<light red>' produced too many runtime errors (<gray>" + limits.lineTimeoutLimit +
-						"<light red> allowed per second). No errors from this line will be printed for " + limits.timeoutDuration + " frames.\n \n"));
+				newTimeouts.add(entry.getKey());
 			}
 		}
 
-		String notification = "";
-		if (printed > 0) {
-			// get various scripts from nodes
-			Set<String> scripts = lineTotals.keySet().stream()
-				.map(ErrorSource::script)
-				.collect(Collectors.toSet());
-			notification = "<light red>Script '<gray>" + scripts.iterator().next();
-			if (scripts.size() > 1) {
-				notification += "<light red>' and " + (scripts.size() - 1) + " others";
-			}
-			notification += "<light red> produced runtime errors. Please check console logs for details.";
-		}
-
-		return new FrameOutput(skippedText, timeoutTexts, notification);
-
+		return new FrameOutput(
+				Collections.unmodifiableMap(lineTotals),
+				Collections.unmodifiableMap(lineSkipped),
+				Collections.unmodifiableSet(newTimeouts),
+				limits);
 	}
 
 }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
index 53fd44f0169..ccf0b2d7b97 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
@@ -1,54 +1,19 @@
 package org.skriptlang.skript.log.runtime;
 
 import ch.njol.skript.localization.ArgsMessage;
-import ch.njol.skript.util.Utils;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.logging.Level;
 
 public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) {
 
-	private static final String CONFIG_NODE = "skript command.reload";
-	private static final ArgsMessage WARNING_DETAILS = new ArgsMessage(CONFIG_NODE + ".warning details");
-	private static final ArgsMessage ERROR_DETAILS = new ArgsMessage(CONFIG_NODE + ".error details");
-	private static final ArgsMessage OTHER_DETAILS = new ArgsMessage(CONFIG_NODE + ".other details");
-	private static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.error");
-	private static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.warning");
-	private static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".runtime.line info");
+	public static final String CONFIG_NODE = "log.runtime";
+	public static final ArgsMessage WARNING_DETAILS = new ArgsMessage("skript command.reload.warning details");
+	public static final ArgsMessage ERROR_DETAILS = new ArgsMessage( "skript command.reload.error details");
+	public static final ArgsMessage OTHER_DETAILS = new ArgsMessage("skript command.reload.other details");
 
-	/**
-	 * @return A formatted string that includes the error as well as any relevant metadata from the source.
-	 */
-	public @NotNull String toFormattedString() {
-		ArgsMessage details;
-		ArgsMessage info;
-		if (level.intValue() == Level.WARNING.intValue()) { // warnings
-			details = WARNING_DETAILS;
-			info = WARNING_INFO;
-		} else if (level.intValue() == Level.SEVERE.intValue()) { // errors
-			details = ERROR_DETAILS;
-			info = ERROR_INFO;
-		} else { // anything else
-			details = OTHER_DETAILS;
-			info = WARNING_INFO;
-		}
-
-		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
-		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
-		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
-
-		String code = source.lineText();
-		if (toHighlight != null)
-			code = code.replaceAll(toHighlight, "§f§n" + toHighlight + "§7");
-
-		return String.format(skriptInfo, source.script(), source.syntaxName(), source.syntaxType()) +
-			String.format(errorInfo, error.replaceAll("§", "&")) +
-			String.format(lineInfo, source.lineNumber(), code);
-	}
-
-	private static @NotNull String replaceNewline(@NotNull String s) {
-		return s.replaceAll("\\\\n", "\n");
-	}
+	public static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".error");
+	public static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".warning");
+	public static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".line info");
 
 }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
index 0c1064713d2..19dd0438990 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
@@ -1,12 +1,23 @@
 package org.skriptlang.skript.log.runtime;
 
+import java.util.logging.Level;
+
 /**
  * Consumes runtime errors. Some use cases include printing errors to console or redirecting to a Discord channel.
  */
 public interface RuntimeErrorConsumer {
 
+	/**
+	 * Prints a single error with all its information.
+	 * @param error The error to print.
+	 */
 	void printError(RuntimeError error);
 
-	void printFrameOutput(Frame.FrameOutput output);
+	/**
+	 * Prints the output of a frame, including skipped errors, timeouts, and whatever other information required.
+	 * @param output An output object containing unmodifiable views of the frame data.
+	 * @param level The severity of this frame (error vs warning).
+	 */
+	void printFrameOutput(Frame.FrameOutput output, Level level);
 
 }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
index 04e1d574721..da38c9c0881 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -9,15 +9,13 @@
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 
 /**
  * Handles duplicate and spammed runtime errors.
  */
 public class RuntimeErrorManager implements Closeable {
 
-
-	public final static String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
-
 	private static RuntimeErrorManager instance;
 
 	public static RuntimeErrorManager getInstance() {
@@ -67,15 +65,15 @@ public static void refresh() {
 	 * @param warningLimits The limits to the warning frame.
 	 */
 	public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit warningLimits) {
-		errorFrame = new Frame("error", errorLimits);
-		warningFrame = new Frame("warning", warningLimits);
+		errorFrame = new Frame(errorLimits);
+		warningFrame = new Frame(warningLimits);
 		task = new Task(Skript.getInstance(), frameLength, frameLength, true) {
 			@Override
 			public void run() {
-				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.printFrame()));
+				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.printFrame(), Level.SEVERE));
 				errorFrame.nextFrame();
 
-				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.printFrame()));
+				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.printFrame(), Level.WARNING));
 				warningFrame.nextFrame();
 			}
 		};
@@ -104,11 +102,15 @@ public Frame getWarningFrame() {
 	}
 
 	public void addConsumer(RuntimeErrorConsumer consumer) {
-		consumers.add(consumer);
+		synchronized (consumers) {
+			consumers.add(consumer);
+		}
 	}
 
 	public void removeConsumer(RuntimeErrorConsumer consumer) {
-		consumers.remove(consumer);
+		synchronized (consumers) {
+			consumers.remove(consumer);
+		}
 	}
 
 	@Override
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index a2b1e37bcf4..1012bd3ef5a 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -65,11 +65,6 @@ skript command:
 		other details: <white>    %s<reset>\n
 		line details: <gold>    Line: <gray>%s<reset>\n <reset>
 
-		runtime:
-			error: <light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s<light red>:\n
-			warning: <gold>The script '<gray>%s<gold>' encountered a warning while executing the '<gray>%s<gold>' %s<gold>:\n
-			line info: <gold>    Line %s<white>: <gray>%s\n \n
-
 		config, aliases and scripts: the config, aliases and all scripts
 		scripts: all scripts
 		main config: the main configuration
@@ -127,6 +122,25 @@ skript command:
 		addons: Installed Skript Addons: <aqua>%s
 		dependencies: Installed dependencies: <aqua>%s
 
+# -- Log Messages --
+log:
+	# runtime errors
+	runtime:
+		error: <light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s<light red>:
+		errors skipped: <gold>%d<light red> runtime error[s] were thrown but not printed in the last frame. From: <gray>%s
+		errors timed out: <gold>Line %d<light red> of script '<gray>%s<light red>' produced too many runtime errors (<gray>%d<light red> allowed per frame). No errors from this line will be printed for %d frames.
+		error notification: <light red>Script '<gray>%s<light red>' produced runtime errors. Please check console logs for details.
+		error notification plural: <light red>Script '<gray>%s<light red>' and %d others produced runtime errors. Please check console logs for details.
+
+		warning: <yellow>The script '<gray>%s<yellow>' encountered a warning while executing the '<gray>%s<yellow>' %s<yellow>:
+		warnings skipped: <yellow>%d<yellow> runtime warning[s] were thrown but not printed in the last frame. From: <gray>%s
+		warnings timed out: <gold>Line %d<yellow> of script '<gray>%s<yellow>' produced too many runtime warnings (<gray>%d<yellow> allowed per frame). No warnings from this line will be printed for %d frames.
+		warning notification: <yellow>Script '<gray>%s<yellow>' produced runtime warnings. Please check console logs for details.
+		warning notification plural: <gold>Script '<gray>%s<yellow>' and %d others produced runtime warnings. Please check console logs for details.
+
+		line info: <gold>    Line %s<white>: <gray>%s\n \n
+
+
 # -- Updater --
 updater:
 	not started: Skript has not yet checked for the latest version. Use <gold>/skript update check<reset> to do so.

From ce365f1780cfd9e5809567c8ac31eff239944fb4 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Wed, 18 Dec 2024 00:23:14 -0500
Subject: [PATCH 11/16] More docs

---
 .../skriptlang/skript/log/runtime/Frame.java  | 19 +++++++-
 .../skript/log/runtime/RuntimeError.java      |  7 +++
 .../log/runtime/RuntimeErrorConsumer.java     |  2 +
 .../log/runtime/RuntimeErrorManager.java      | 45 +++++++++++++++----
 .../log/runtime/RuntimeErrorProducer.java     | 29 +++---------
 .../runtime/SyntaxRuntimeErrorProducer.java   | 34 ++++++++++++++
 6 files changed, 103 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java

diff --git a/src/main/java/org/skriptlang/skript/log/runtime/Frame.java b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
index 050eafd04a6..b2c909ce817 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
@@ -43,6 +43,10 @@ public record FrameOutput(
 	private final Map<Location, Integer> lineSkipped;
 	private final Map<Location, Integer> timeouts;
 
+	/**
+	 * Creates a blank frame with the given limits
+	 * @param limits The limits to use for when to skip or timeout.
+	 */
 	public Frame(FrameLimit limits) {
 		this.limits = limits;
 		lineTotals = new ConcurrentHashMap<>();
@@ -50,6 +54,11 @@ public Frame(FrameLimit limits) {
 		timeouts = new ConcurrentHashMap<>();
 	}
 
+	/**
+	 * Adds an error to this frame.
+	 * @param error The error to add.
+	 * @return Whether the error should be printed immediately.
+	 */
 	public boolean add(@NotNull RuntimeError error) {
 		Location location = error.source().location();
 		// increment counter
@@ -74,6 +83,9 @@ public boolean add(@NotNull RuntimeError error) {
 		}
 	}
 
+	/**
+	 * Advances the frame to the next frame, clearing all stored totals and decrementing timeout counters.
+	 */
 	public void nextFrame() {
 		printed = 0;
 		lineTotals.clear();
@@ -88,8 +100,13 @@ public void nextFrame() {
 		}
 	}
 
+	/**
+	 * Gets the output data for a frame.
+	 * Returned data contains unmodifiable views of frame data, which is not guaranteed to stay valid.
+	 * @return The current output data of this frame.
+	 */
 	@Contract(" -> new")
-	public @NotNull FrameOutput printFrame() {
+	public @NotNull FrameOutput getFrameOutput() {
 		Set<Location> newTimeouts = new HashSet<>();
 		for (Map.Entry<Location, Integer> entry : timeouts.entrySet()) {
 			if (entry.getValue() == limits.timeoutDuration) {
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
index ccf0b2d7b97..f7f2ba310c3 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
@@ -5,6 +5,13 @@
 
 import java.util.logging.Level;
 
+/**
+ * Represents a single instance of a runtime error.
+ * @param level The severity (warning or severe)
+ * @param source The source of the error
+ * @param error The message to display as the error
+ * @param toHighlight Optionally, the text within the emitting line to highlight.
+ */
 public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) {
 
 	public static final String CONFIG_NODE = "log.runtime";
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
index 19dd0438990..21d271bfaca 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
@@ -4,6 +4,8 @@
 
 /**
  * Consumes runtime errors. Some use cases include printing errors to console or redirecting to a Discord channel.
+ *
+ * @see org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer
  */
 public interface RuntimeErrorConsumer {
 
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
index da38c9c0881..d2ce1f17b04 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -4,6 +4,7 @@
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
+import org.jetbrains.annotations.NotNull;
 import org.skriptlang.skript.log.runtime.Frame.FrameLimit;
 
 import java.io.Closeable;
@@ -12,7 +13,16 @@
 import java.util.logging.Level;
 
 /**
- * Handles duplicate and spammed runtime errors.
+ * Handles passing runtime errors between producers and consumers via a frame collection system.
+ * <br>
+ * The manager should be treated as a singleton and accessed via {@link #getInstance()}
+ * or {@link Skript#getRuntimeErrorManager()}. Changing the frame length or limits requires edits to the
+ * {@link SkriptConfig} values and a call to {@link #refresh()}. Reloading the config will automatically
+ * call {@link #refresh()}.
+ *
+ * @see RuntimeErrorConsumer
+ * @see RuntimeErrorProducer
+ * @see Frame
  */
 public class RuntimeErrorManager implements Closeable {
 
@@ -24,6 +34,7 @@ public static RuntimeErrorManager getInstance() {
 
 	/**
 	 * Refreshes the runtime error manager for Skript, pulling from the config values.
+	 * Tracked consumers are maintained during refreshes.
 	 */
 	public static void refresh() {
 
@@ -70,43 +81,59 @@ public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit w
 		task = new Task(Skript.getInstance(), frameLength, frameLength, true) {
 			@Override
 			public void run() {
-				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.printFrame(), Level.SEVERE));
+				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.getFrameOutput(), Level.SEVERE));
 				errorFrame.nextFrame();
 
-				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.printFrame(), Level.WARNING));
+				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.getFrameOutput(), Level.WARNING));
 				warningFrame.nextFrame();
 			}
 		};
 	}
 
-	public void error(RuntimeError error) {
+	/**
+	 * Emits a warning or error depending on severity. Errors are passed to their respective {@link Frame}s for processing.
+	 * @param error The error to emit.
+	 */
+	public void error(@NotNull RuntimeError error) {
 		// print if < limit
-		if (errorFrame.add(error)) {
+		if (error.level() == Level.SEVERE && errorFrame.add(error)) {
 			consumers.forEach((consumer -> consumer.printError(error)));
 		}
-	}
 
-	public void warning(RuntimeError error){
-		// print if < limit
-		if (warningFrame.add(error)) {
+		if (error.level() == Level.WARNING && warningFrame.add(error)) {
 			consumers.forEach((consumer -> consumer.printError(error)));
 		}
 	}
 
+	/**
+	 * @return The frame containing emitted errors.
+	 */
 	public Frame getErrorFrame() {
 		return errorFrame;
 	}
 
+	/**
+	 * @return The frame containing emitted warnings.
+	 */
 	public Frame getWarningFrame() {
 		return warningFrame;
 	}
 
+	/**
+	 * Adds a {@link RuntimeErrorConsumer} that will receive the emitted errors and frame output data.
+	 * Consumers will be maintained when the manager is refreshed.
+	 * @param consumer The consumer to add.
+	 */
 	public void addConsumer(RuntimeErrorConsumer consumer) {
 		synchronized (consumers) {
 			consumers.add(consumer);
 		}
 	}
 
+	/**
+	 * Removes a {@link RuntimeErrorConsumer} from the tracked list.
+	 * @param consumer The consumer to remove.
+	 */
 	public void removeConsumer(RuntimeErrorConsumer consumer) {
 		synchronized (consumers) {
 			consumers.remove(consumer);
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
index 60bf5a65b12..53a5a55e322 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
@@ -1,11 +1,9 @@
 package org.skriptlang.skript.log.runtime;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SyntaxElement;
-import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -15,32 +13,17 @@
 
 /**
  * A RuntimeErrorProducer can throw runtime errors in a standardized and controlled manner.
- * Only {@link SyntaxElement}s are intended to implement this interface.
  */
 public interface RuntimeErrorProducer {
 
-	// todo: try/catch, suppression when annotations are added
-
-	/**
-	 * Returns the source {@link Node} for any errors the implementing class emits.
-	 * <br>
-	 * Used for accessing the line contents via {@link Node#getKey()}
-	 * and the line number via {@link Node#getLine()}.
-	 * <br>
-	 * A standard implementation is to store the Node during
-	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
-	 * via {@link ParserInstance#getNode()}.
-	 * @return The source that produced a runtime error.
-	 */
-	Node getNode();
-
 	/**
-	 * @return A source composed of the implementing {@link SyntaxElement} and the result of {@link #getNode()}
+	 * Gets the source of the errors produced by the implementing class.
+	 * Most extending interfaces should provide a default implementation of this method for ease of use.
+	 * @see SyntaxRuntimeErrorProducer
+	 * @return The source of the error.
 	 */
 	@Contract(" -> new")
-	private @NotNull ErrorSource getErrorSource() {
-		return ErrorSource.fromNodeAndElement(getNode(), (SyntaxElement) this);
-	}
+	@NotNull ErrorSource getErrorSource();
 
 	/**
 	 * Gets the text that should be underlined within the line contents. This should match the text the user wrote that
@@ -83,7 +66,7 @@ default void error(String message) {
 	 * @param message The text to display as the error message.
 	 */
 	default void warning(String message) {
-		Skript.getRuntimeErrorManager().warning(
+		Skript.getRuntimeErrorManager().error(
 			new RuntimeError(Level.WARNING, getErrorSource(), message, toHighlight())
 		);
 	}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java
new file mode 100644
index 00000000000..6dfe8648700
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java
@@ -0,0 +1,34 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A runtime error producer intended for use with {@link SyntaxElement}s. Uses {@link Node}s to determine source.
+ */
+public interface SyntaxRuntimeErrorProducer extends RuntimeErrorProducer {
+
+	/**
+	 * Returns the source {@link Node} for any errors the implementing class emits.
+	 * <br>
+	 * Used for accessing the line contents via {@link Node#getKey()}
+	 * and the line number via {@link Node#getLine()}.
+	 * <br>
+	 * A standard implementation is to store the Node during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
+	 * via {@link ParserInstance#getNode()}.
+	 * @return The source that produced a runtime error.
+	 */
+	Node getNode();
+
+	@Override
+	default @NotNull ErrorSource getErrorSource() {
+		return ErrorSource.fromNodeAndElement(getNode(), (SyntaxElement) this);
+	}
+
+}

From 736c4bc2a2831026cde5aa3d3cb6f6433cb82b5b Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Wed, 18 Dec 2024 00:52:14 -0500
Subject: [PATCH 12/16] whoopsie-daisy

---
 .../skript/expressions/base/SimplePropertyExpression.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index 7930e2ebfe9..3c34df344b4 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -8,7 +8,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.log.runtime.RuntimeErrorProducer;
+import org.skriptlang.skript.log.runtime.SyntaxRuntimeErrorProducer;
 
 /**
  * A base class for property expressions that requires only few overridden methods
@@ -17,7 +17,7 @@
  * @see PropertyExpression#register(Class, Class, String, String)
  */
 @SuppressWarnings("deprecation") // for backwards compatibility
-public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T>, RuntimeErrorProducer {
+public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T>, SyntaxRuntimeErrorProducer {
 
 	private Node node;
 	private String rawExpr;

From 13ff6c721bb8e61369253e5d27610466caccde1f Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Fri, 20 Dec 2024 18:23:14 -0500
Subject: [PATCH 13/16] Requested Changes

---
 .../runtime/BukkitRuntimeErrorConsumer.java   | 41 +++++++++++--------
 .../skript/log/runtime/ErrorSource.java       |  2 +-
 .../skript/log/runtime/RuntimeError.java      | 14 +------
 .../log/runtime/RuntimeErrorProducer.java     | 11 ++++-
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
index e1a22f8f905..72ad7021a12 100644
--- a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
+++ b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
@@ -25,40 +25,49 @@ public class BukkitRuntimeErrorConsumer implements RuntimeErrorConsumer {
 
 	public final static String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
 
-	public static final ArgsMessage ERROR_SKIPPED = new ArgsMessage(RuntimeError.CONFIG_NODE + ".errors skipped");
-	public static final ArgsMessage ERROR_TIMEOUT = new ArgsMessage(RuntimeError.CONFIG_NODE + ".errors timed out");
-	public static final ArgsMessage ERROR_NOTIF = new ArgsMessage(RuntimeError.CONFIG_NODE + ".error notification");
-	public static final ArgsMessage ERROR_NOTIF_PLURAL = new ArgsMessage(RuntimeError.CONFIG_NODE + ".error notification plural");
+	public static final String CONFIG_NODE = "log.runtime";
+	public static final ArgsMessage WARNING_DETAILS = new ArgsMessage("skript command.reload.warning details");
+	public static final ArgsMessage ERROR_DETAILS = new ArgsMessage( "skript command.reload.error details");
+	public static final ArgsMessage OTHER_DETAILS = new ArgsMessage("skript command.reload.other details");
 
-	public static final ArgsMessage WARNING_SKIPPED = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warnings skipped");
-	public static final ArgsMessage WARNING_TIMEOUT = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warnings timed out");
-	public static final ArgsMessage WARNING_NOTIF = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warning notification");
-	public static final ArgsMessage WARNING_NOTIF_PLURAL = new ArgsMessage(RuntimeError.CONFIG_NODE + ".warning notification plural");
+	public static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".error");
+	public static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".warning");
+	public static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".line info");
+
+	public static final ArgsMessage ERROR_SKIPPED = new ArgsMessage(CONFIG_NODE + ".errors skipped");
+	public static final ArgsMessage ERROR_TIMEOUT = new ArgsMessage(CONFIG_NODE + ".errors timed out");
+	public static final ArgsMessage ERROR_NOTIF = new ArgsMessage(CONFIG_NODE + ".error notification");
+	public static final ArgsMessage ERROR_NOTIF_PLURAL = new ArgsMessage(CONFIG_NODE + ".error notification plural");
+
+	public static final ArgsMessage WARNING_SKIPPED = new ArgsMessage(CONFIG_NODE + ".warnings skipped");
+	public static final ArgsMessage WARNING_TIMEOUT = new ArgsMessage(CONFIG_NODE + ".warnings timed out");
+	public static final ArgsMessage WARNING_NOTIF = new ArgsMessage(CONFIG_NODE + ".warning notification");
+	public static final ArgsMessage WARNING_NOTIF_PLURAL = new ArgsMessage(CONFIG_NODE + ".warning notification plural");
 
 	@Override
 	public void printError(@NotNull RuntimeError error) {
 		ArgsMessage details;
 		ArgsMessage info;
 		if (error.level().intValue() == Level.WARNING.intValue()) { // warnings
-			details = RuntimeError.WARNING_DETAILS;
-			info = RuntimeError.WARNING_INFO;
+			details = WARNING_DETAILS;
+			info = WARNING_INFO;
 		} else if (error.level().intValue() == Level.SEVERE.intValue()) { // errors
-			details = RuntimeError.ERROR_DETAILS;
-			info = RuntimeError.ERROR_INFO;
+			details = ERROR_DETAILS;
+			info = ERROR_INFO;
 		} else { // anything else
-			details = RuntimeError.OTHER_DETAILS;
-			info = RuntimeError.WARNING_INFO;
+			details = OTHER_DETAILS;
+			info = WARNING_INFO;
 		}
 
 		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
 		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
 		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(
-				RuntimeError.LINE_INFO.getValue() == null ? RuntimeError.LINE_INFO.key : RuntimeError.LINE_INFO.getValue()));
+				LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
 
 		ErrorSource source = error.source();
 		String code = source.lineText();
 		if (error.toHighlight() != null && !error.toHighlight().isEmpty())
-			code = code.replace(error.toHighlight(), "§f§n" + error.toHighlight() + "§7");
+			code = code.replace("§", "&").replace(error.toHighlight(), "§f§n" + error.toHighlight() + "§7");
 
 		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
 				String.format(skriptInfo, source.script(), source.syntaxName(), source.syntaxType()) +
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
index 1bb5a7a8357..63cf8e573cd 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
@@ -36,7 +36,7 @@ public record ErrorSource(
 		if (node == null) {
 			return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-effect command-");
 		}
-		String code = node.save().trim().replaceAll("§", "&");
+		String code = node.save().trim();
 		return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
 	}
 
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
index f7f2ba310c3..2b99be73382 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
@@ -1,6 +1,5 @@
 package org.skriptlang.skript.log.runtime;
 
-import ch.njol.skript.localization.ArgsMessage;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.logging.Level;
@@ -12,15 +11,4 @@
  * @param error The message to display as the error
  * @param toHighlight Optionally, the text within the emitting line to highlight.
  */
-public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) {
-
-	public static final String CONFIG_NODE = "log.runtime";
-	public static final ArgsMessage WARNING_DETAILS = new ArgsMessage("skript command.reload.warning details");
-	public static final ArgsMessage ERROR_DETAILS = new ArgsMessage( "skript command.reload.error details");
-	public static final ArgsMessage OTHER_DETAILS = new ArgsMessage("skript command.reload.other details");
-
-	public static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".error");
-	public static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".warning");
-	public static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".line info");
-
-}
+public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) { }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
index 53a5a55e322..3e36e051675 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
@@ -51,7 +51,7 @@ public interface RuntimeErrorProducer {
 	 * @param message The text to display as the error message.
 	 */
 	default void error(String message) {
-		Skript.getRuntimeErrorManager().error(
+		getRuntimeErrorManager().error(
 			new RuntimeError(Level.SEVERE, getErrorSource(), message, toHighlight())
 		);
 	}
@@ -66,9 +66,16 @@ default void error(String message) {
 	 * @param message The text to display as the error message.
 	 */
 	default void warning(String message) {
-		Skript.getRuntimeErrorManager().error(
+		getRuntimeErrorManager().error(
 			new RuntimeError(Level.WARNING, getErrorSource(), message, toHighlight())
 		);
 	}
 
+	/**
+	 * @return The manager this producer will send errors to.
+	 */
+	default RuntimeErrorManager getRuntimeErrorManager() {
+		return Skript.getRuntimeErrorManager();
+	}
+
 }

From 5cfb74d8eeaf0e63e169fb5a89103dca1b57f125 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Fri, 20 Dec 2024 18:37:25 -0500
Subject: [PATCH 14/16] Update
 src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
---
 .../org/skriptlang/skript/log/runtime/RuntimeErrorManager.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
index d2ce1f17b04..ddc325e59ac 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -37,7 +37,6 @@ public static RuntimeErrorManager getInstance() {
 	 * Tracked consumers are maintained during refreshes.
 	 */
 	public static void refresh() {
-
 		long frameLength = SkriptConfig.runtimeErrorFrameDuration.value().getAs(Timespan.TimePeriod.TICK);
 
 		int errorLimit = SkriptConfig.runtimeErrorLimitTotal.value();

From 2ef17fe3e489362029c14e5ccbc9f96720f0db5b Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:43:43 -0500
Subject: [PATCH 15/16] requested changes

---
 src/main/java/ch/njol/skript/Skript.java            |  2 +-
 .../log/runtime/BukkitRuntimeErrorConsumer.java     |  2 +-
 .../skriptlang/skript/log/runtime/ErrorSource.java  |  2 +-
 .../skript/log/runtime/RuntimeErrorManager.java     | 13 ++++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 5803db88110..9737903932c 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -526,7 +526,7 @@ public void onEnable() {
 
 		// init runtime error manager and add bukkit consumer.
 		RuntimeErrorManager.refresh();
-		RuntimeErrorManager.getInstance().addConsumer(new BukkitRuntimeErrorConsumer());
+		getRuntimeErrorManager().addConsumer(new BukkitRuntimeErrorConsumer());
 
 		CompletableFuture<Boolean> aliases = Aliases.loadAsync();
 
diff --git a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
index 72ad7021a12..bd9b2201eb3 100644
--- a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
+++ b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
@@ -23,7 +23,7 @@
  */
 public class BukkitRuntimeErrorConsumer implements RuntimeErrorConsumer {
 
-	public final static String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
+	public static final String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
 
 	public static final String CONFIG_NODE = "log.runtime";
 	public static final ArgsMessage WARNING_DETAILS = new ArgsMessage("skript command.reload.warning details");
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
index 63cf8e573cd..10627724302 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
@@ -34,7 +34,7 @@ public record ErrorSource(
 	public static @NotNull ErrorSource fromNodeAndElement(@Nullable Node node, @NotNull SyntaxElement element) {
 		String elementName = element.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
 		if (node == null) {
-			return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-effect command-");
+			return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-unknown-");
 		}
 		String code = node.save().trim();
 		return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
index ddc325e59ac..b44688da1c0 100644
--- a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -4,6 +4,7 @@
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.skriptlang.skript.log.runtime.Frame.FrameLimit;
 
@@ -28,6 +29,11 @@ public class RuntimeErrorManager implements Closeable {
 
 	private static RuntimeErrorManager instance;
 
+	/**
+	 * Prefer using {@link Skript#getRuntimeErrorManager()} instead.
+	 * @return The singleton instance of the runtime error manager.
+	 */
+	@ApiStatus.Internal
 	public static RuntimeErrorManager getInstance() {
 		return instance;
 	}
@@ -95,11 +101,8 @@ public void run() {
 	 */
 	public void error(@NotNull RuntimeError error) {
 		// print if < limit
-		if (error.level() == Level.SEVERE && errorFrame.add(error)) {
-			consumers.forEach((consumer -> consumer.printError(error)));
-		}
-
-		if (error.level() == Level.WARNING && warningFrame.add(error)) {
+		if ((error.level() == Level.SEVERE && errorFrame.add(error))
+			|| (error.level() == Level.WARNING && warningFrame.add(error))) {
 			consumers.forEach((consumer -> consumer.printError(error)));
 		}
 	}

From 4eb5b8d0515ce722a2251f220fe1d80640645099 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:54:35 -0500
Subject: [PATCH 16/16] i'm so bad at conflict resolution

---
 .../njol/skript/expressions/base/SimplePropertyExpression.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index a9abd261085..0dc4db2d7fd 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -16,7 +16,7 @@
  * @see PropertyExpression
  * @see PropertyExpression#register(Class, Class, String, String)
  */
-public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T> {
+public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T>, SyntaxRuntimeErrorProducer {
 
 	private Node node;
 	private String rawExpr;