From e9df3562e70c85f94c75852c76cabf0b3ea2f66c Mon Sep 17 00:00:00 2001
From: Eren KARA <karaeren362@gmail.com>
Date: Tue, 16 Sep 2025 12:20:53 +0300
Subject: [PATCH 01/11] add global options

---
 .../java/ch/njol/skript/ScriptLoader.java     |  8 +-
 src/main/java/ch/njol/skript/Skript.java      |  2 +
 .../java/ch/njol/skript/SkriptCommand.java    |  6 ++
 .../ch/njol/skript/lang/GlobalOptions.java    | 98 +++++++++++++++++++
 .../njol/skript/structures/StructOptions.java |  3 +-
 src/main/resources/global-options.sk          | 11 +++
 src/main/resources/lang/english.lang          |  2 +
 7 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/ch/njol/skript/lang/GlobalOptions.java
 create mode 100644 src/main/resources/global-options.sk

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index eb64a4085d0..24936112484 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -5,11 +5,7 @@
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.config.SimpleNode;
 import ch.njol.skript.events.bukkit.PreScriptLoadEvent;
-import ch.njol.skript.lang.ExecutionIntent;
-import ch.njol.skript.lang.Section;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.Statement;
-import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.CountingLogHandler;
 import ch.njol.skript.log.LogEntry;
@@ -937,7 +933,7 @@ public static String replaceOptions(String string) {
 			return string;
 		OptionsData optionsData = parser.getCurrentScript().getData(OptionsData.class);
 		if (optionsData == null)
-			return string;
+			return GlobalOptions.replaceOptions(string);
 		return optionsData.replaceOptions(string);
 	}
 
diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 616c20b3e98..6841ca50ea9 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -539,6 +539,8 @@ public void onEnable() {
 		RuntimeErrorManager.refresh();
 		getRuntimeErrorManager().addConsumer(new BukkitRuntimeErrorConsumer());
 
+		GlobalOptions.load();
+
 		// Now override the verbosity if test mode is enabled
 		if (TestMode.VERBOSITY != null)
 			SkriptLogger.setVerbosity(Verbosity.valueOf(TestMode.VERBOSITY));
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index d27ec05ed45..2d5554a4707 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -5,6 +5,7 @@
 import ch.njol.skript.doc.Documentation;
 import ch.njol.skript.doc.HTMLGenerator;
 import ch.njol.skript.doc.JSONGenerator;
+import ch.njol.skript.lang.GlobalOptions;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.PluralizingArgsMessage;
@@ -53,6 +54,7 @@ public class SkriptCommand implements CommandExecutor {
 				.add("config")
 				.add("aliases")
 				.add("scripts")
+				.add("global-options")
 				.add("<script>")
 			).add(new CommandHelp("enable", SkriptColor.DARK_RED)
 				.add("all")
@@ -168,6 +170,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 					reloading(sender, "aliases", logHandler);
 					Aliases.clear();
 					Aliases.loadAsync().thenRun(() -> reloaded(sender, logHandler, timingLogHandler, "aliases"));
+				} else if (args[1].equalsIgnoreCase("global-options")) {
+					reloading(sender, "global options", logHandler);
+					GlobalOptions.load();
+					reloaded(sender, logHandler, timingLogHandler, "global options");
 				} else { // Reloading an individual Script or folder
 					File scriptFile = getScriptFromArgs(sender, args);
 					if (scriptFile == null)
diff --git a/src/main/java/ch/njol/skript/lang/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/GlobalOptions.java
new file mode 100644
index 00000000000..ce6b7f0d83a
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/GlobalOptions.java
@@ -0,0 +1,98 @@
+package ch.njol.skript.lang;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Config;
+import ch.njol.skript.config.EntryNode;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.util.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+/**
+ * Represents the global-options.sk file
+ */
+public class GlobalOptions {
+
+	private static final Map<String, String> options = new HashMap<>();
+
+	/**
+	 * Loads the global-options.sk file
+	 */
+	public static void load() {
+		options.clear();
+		File file = new File(Skript.getInstance().getDataFolder(), "global-options.sk");
+		if (!file.exists()) {
+			createFile(file);
+		}
+		try {
+			Config config = new Config(file, true, false, ":");
+			config.getMainNode().convertToEntries(-1);
+			loadOptions(config.getMainNode(), "", options);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+
+	}
+
+	/**
+	 * @return An unmodifiable map of global options
+	 */
+	public static Map<String, String> getOptions() {
+		return Collections.unmodifiableMap(options);
+	}
+
+	/**
+	 * Replaces global options in a string
+	 */
+	public static String replaceOptions(String string) {
+		if (options.isEmpty()) { // don't bother
+			return string;
+		}
+		return StringUtils.replaceAll(string, "\\{@(.+?)\\}", m -> {
+			String option = GlobalOptions.getOptions().get(m.group(1));
+			if (option == null) {
+				Skript.error("undefined option " + m.group());
+				return m.group();
+			}
+			return Matcher.quoteReplacement(option);
+		});
+	}
+
+	/**
+	 * Loads the global-options.sk file from the jar
+	 */
+	private static void createFile(File targetFile) {
+		try (InputStream stream = Skript.getInstance().getResource("global-options.sk")) {
+			if (stream == null) {
+				Skript.error("The global-options.sk file doesn't exist and couldn't be read from the jar file.");
+				return;
+			}
+			Files.copy(stream, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+		} catch (IOException e) {
+			// TODO - i don't know what to do with the exception
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static void loadOptions(SectionNode sectionNode, String prefix, Map<String, String> options) {
+		for (Node node : sectionNode) {
+			if (node instanceof EntryNode) {
+				options.put(prefix + node.getKey(), ((EntryNode) node).getValue());
+			} else if (node instanceof SectionNode) {
+				loadOptions((SectionNode) node, prefix + node.getKey() + ".", options);
+			} else {
+				Skript.error("Invalid line in options");
+			}
+		}
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/structures/StructOptions.java b/src/main/java/ch/njol/skript/structures/StructOptions.java
index 2224a7b1641..122c7c1b800 100644
--- a/src/main/java/ch/njol/skript/structures/StructOptions.java
+++ b/src/main/java/ch/njol/skript/structures/StructOptions.java
@@ -8,6 +8,7 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.GlobalOptions;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.StringUtils;
@@ -107,7 +108,7 @@ public static final class OptionsData implements ScriptData {
 		@SuppressWarnings("ConstantConditions") // no way to get null as callback does not return null anywhere
 		public String replaceOptions(String string) {
 			return StringUtils.replaceAll(string, "\\{@(.+?)\\}", m -> {
-				String option = options.get(m.group(1));
+				String option = options.getOrDefault(m.group(1), GlobalOptions.getOptions().get(m.group(1)));
 				if (option == null) {
 					Skript.error("undefined option " + m.group());
 					return m.group();
diff --git a/src/main/resources/global-options.sk b/src/main/resources/global-options.sk
new file mode 100644
index 00000000000..f8a75359de9
--- /dev/null
+++ b/src/main/resources/global-options.sk
@@ -0,0 +1,11 @@
+#
+# This file lets you set options globally.
+# Options here will be available across all scripts.
+# Scripts can override a global option by creating an option with the same name as the global one.
+#
+# Example usage of this file:
+# server name: SkriptLand   # {@server name}
+# join messages:
+#   first join: %player% joined for the first time!   # {@join messages.first join}
+#   welcome back: Welcome back %player%!   # {@join messages.welcome back}
+#
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index 9350961b1b4..1b0379ee340 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -31,6 +31,7 @@ skript command:
 			all: Reloads the config, all aliases configs and all scripts
 			config: Reloads the main config
 			aliases: Reloads the aliases configs (aliases-english.zip or plugin jar)
+			global-options: Reloads the global options
 			scripts: Reloads all scripts
 			<script>: Reloads a specific script or a folder of scripts
 		enable:
@@ -69,6 +70,7 @@ skript command:
 		scripts: all scripts
 		main config: the main configuration
 		aliases: the aliases
+		global options: the global options
 		script: <gold>%s<reset>
 		scripts in folder: all scripts in <gold>%s<reset>
 		x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>

From a2d1cbd193ce2cd0b0eec1c7d52f6c59a4eaa34a Mon Sep 17 00:00:00 2001
From: Eren KARA <karaeren362@gmail.com>
Date: Tue, 16 Sep 2025 12:36:59 +0300
Subject: [PATCH 02/11] add warning

---
 src/main/resources/global-options.sk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/global-options.sk b/src/main/resources/global-options.sk
index f8a75359de9..3fa84fdcb99 100644
--- a/src/main/resources/global-options.sk
+++ b/src/main/resources/global-options.sk
@@ -2,6 +2,7 @@
 # This file lets you set options globally.
 # Options here will be available across all scripts.
 # Scripts can override a global option by creating an option with the same name as the global one.
+# When you edit this file, you must reload global-options and all script files that use global options.
 #
 # Example usage of this file:
 # server name: SkriptLand   # {@server name}

From 0b976a3b8815406f12327bf7af1ab26c1c45f165 Mon Sep 17 00:00:00 2001
From: Eren KARA <karaeren362@gmail.com>
Date: Tue, 16 Sep 2025 12:37:11 +0300
Subject: [PATCH 03/11] fix /sk reload all

---
 src/main/java/ch/njol/skript/SkriptCommand.java | 5 +++--
 src/main/resources/lang/english.lang            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 2d5554a4707..1b8127e4bfe 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -140,8 +140,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			if (args[0].equalsIgnoreCase("reload")) {
 
 				if (args[1].equalsIgnoreCase("all")) {
-					reloading(sender, "config, aliases and scripts", logHandler);
+					reloading(sender, "config, aliases, global options and scripts", logHandler);
 					SkriptConfig.load();
+					GlobalOptions.load();
 					Aliases.clear();
 					Aliases.loadAsync().thenRun(() -> {
 						ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
@@ -149,7 +150,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 							.thenAccept(info -> {
 								if (info.files == 0)
 									Skript.warning(Skript.m_no_scripts.toString());
-								reloaded(sender, logHandler, timingLogHandler, "config, aliases and scripts");
+								reloaded(sender, logHandler, timingLogHandler, "config, aliases, global options and scripts");
 							});
 					});
 				} else if (args[1].equalsIgnoreCase("scripts")) {
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index 1b0379ee340..83957412cf8 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -66,7 +66,7 @@ skript command:
 		other details: <white>    %s<reset>\n
 		line details: <gold>    Line: <gray>%s<reset>\n <reset>
 
-		config, aliases and scripts: the config, aliases and all scripts
+		config, aliases, global options and scripts: the config, aliases, global options and all scripts
 		scripts: all scripts
 		main config: the main configuration
 		aliases: the aliases

From 79dae5e17e74f8d2f1e381806821006201460caa Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 18:33:09 +0300
Subject: [PATCH 04/11] requested changes

---
 .../java/ch/njol/skript/ScriptLoader.java     |  1 +
 src/main/java/ch/njol/skript/Skript.java      |  8 +-
 .../java/ch/njol/skript/SkriptCommand.java    |  6 +-
 .../ch/njol/skript/lang/GlobalOptions.java    | 98 -------------------
 .../njol/skript/lang/globals/GlobalFile.java  | 42 ++++++++
 .../skript/lang/globals/GlobalOptions.java    | 63 ++++++++++++
 .../njol/skript/structures/StructOptions.java |  5 +-
 .../{global-options.sk => globals/options.sk} |  3 +-
 src/main/resources/lang/english.lang          |  1 +
 9 files changed, 121 insertions(+), 106 deletions(-)
 delete mode 100644 src/main/java/ch/njol/skript/lang/GlobalOptions.java
 create mode 100644 src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
 create mode 100644 src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
 rename src/main/resources/{global-options.sk => globals/options.sk} (77%)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 24936112484..3992d163347 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -6,6 +6,7 @@
 import ch.njol.skript.config.SimpleNode;
 import ch.njol.skript.events.bukkit.PreScriptLoadEvent;
 import ch.njol.skript.lang.*;
+import ch.njol.skript.lang.globals.GlobalOptions;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.CountingLogHandler;
 import ch.njol.skript.log.LogEntry;
diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 6841ca50ea9..75c48e6245e 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -17,6 +17,7 @@
 import ch.njol.skript.hooks.Hook;
 import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.Condition.ConditionType;
+import ch.njol.skript.lang.globals.GlobalOptions;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.Message;
@@ -539,7 +540,12 @@ public void onEnable() {
 		RuntimeErrorManager.refresh();
 		getRuntimeErrorManager().addConsumer(new BukkitRuntimeErrorConsumer());
 
-		GlobalOptions.load();
+		File globalsFolder = new File(Skript.getInstance().getDataFolder(), "/globals/");
+		if (!globalsFolder.exists()) {
+			globalsFolder.mkdir(); // TODO - handle case where folder fails to be created ?
+		}
+
+ 		new GlobalOptions().load();
 
 		// Now override the verbosity if test mode is enabled
 		if (TestMode.VERBOSITY != null)
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 1b8127e4bfe..3e24d3c7faf 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -5,7 +5,7 @@
 import ch.njol.skript.doc.Documentation;
 import ch.njol.skript.doc.HTMLGenerator;
 import ch.njol.skript.doc.JSONGenerator;
-import ch.njol.skript.lang.GlobalOptions;
+import ch.njol.skript.lang.globals.GlobalOptions;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.PluralizingArgsMessage;
@@ -142,7 +142,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				if (args[1].equalsIgnoreCase("all")) {
 					reloading(sender, "config, aliases, global options and scripts", logHandler);
 					SkriptConfig.load();
-					GlobalOptions.load();
+					new GlobalOptions().load();
 					Aliases.clear();
 					Aliases.loadAsync().thenRun(() -> {
 						ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
@@ -173,7 +173,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 					Aliases.loadAsync().thenRun(() -> reloaded(sender, logHandler, timingLogHandler, "aliases"));
 				} else if (args[1].equalsIgnoreCase("global-options")) {
 					reloading(sender, "global options", logHandler);
-					GlobalOptions.load();
+					new GlobalOptions().load();
 					reloaded(sender, logHandler, timingLogHandler, "global options");
 				} else { // Reloading an individual Script or folder
 					File scriptFile = getScriptFromArgs(sender, args);
diff --git a/src/main/java/ch/njol/skript/lang/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/GlobalOptions.java
deleted file mode 100644
index ce6b7f0d83a..00000000000
--- a/src/main/java/ch/njol/skript/lang/GlobalOptions.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package ch.njol.skript.lang;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.config.Config;
-import ch.njol.skript.config.EntryNode;
-import ch.njol.skript.config.Node;
-import ch.njol.skript.config.SectionNode;
-import ch.njol.util.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-
-/**
- * Represents the global-options.sk file
- */
-public class GlobalOptions {
-
-	private static final Map<String, String> options = new HashMap<>();
-
-	/**
-	 * Loads the global-options.sk file
-	 */
-	public static void load() {
-		options.clear();
-		File file = new File(Skript.getInstance().getDataFolder(), "global-options.sk");
-		if (!file.exists()) {
-			createFile(file);
-		}
-		try {
-			Config config = new Config(file, true, false, ":");
-			config.getMainNode().convertToEntries(-1);
-			loadOptions(config.getMainNode(), "", options);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-
-	}
-
-	/**
-	 * @return An unmodifiable map of global options
-	 */
-	public static Map<String, String> getOptions() {
-		return Collections.unmodifiableMap(options);
-	}
-
-	/**
-	 * Replaces global options in a string
-	 */
-	public static String replaceOptions(String string) {
-		if (options.isEmpty()) { // don't bother
-			return string;
-		}
-		return StringUtils.replaceAll(string, "\\{@(.+?)\\}", m -> {
-			String option = GlobalOptions.getOptions().get(m.group(1));
-			if (option == null) {
-				Skript.error("undefined option " + m.group());
-				return m.group();
-			}
-			return Matcher.quoteReplacement(option);
-		});
-	}
-
-	/**
-	 * Loads the global-options.sk file from the jar
-	 */
-	private static void createFile(File targetFile) {
-		try (InputStream stream = Skript.getInstance().getResource("global-options.sk")) {
-			if (stream == null) {
-				Skript.error("The global-options.sk file doesn't exist and couldn't be read from the jar file.");
-				return;
-			}
-			Files.copy(stream, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-		} catch (IOException e) {
-			// TODO - i don't know what to do with the exception
-			throw new RuntimeException(e);
-		}
-	}
-
-	private static void loadOptions(SectionNode sectionNode, String prefix, Map<String, String> options) {
-		for (Node node : sectionNode) {
-			if (node instanceof EntryNode) {
-				options.put(prefix + node.getKey(), ((EntryNode) node).getValue());
-			} else if (node instanceof SectionNode) {
-				loadOptions((SectionNode) node, prefix + node.getKey() + ".", options);
-			} else {
-				Skript.error("Invalid line in options");
-			}
-		}
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
new file mode 100644
index 00000000000..6b8074b2213
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
@@ -0,0 +1,42 @@
+package ch.njol.skript.lang.globals;
+
+import ch.njol.skript.Skript;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+/**
+ * Represents a file in the globals folder
+ */
+abstract class GlobalFile {
+
+	protected final File file;
+
+	public GlobalFile(String name) {
+		String filePath = "globals/" + name + ".sk";
+		file = new File(Skript.getInstance().getDataFolder(), filePath);
+
+		if (!file.exists()) {
+			loadFile(filePath, file);
+		}
+	}
+
+	/**
+	 * Loads a file from the Skript jar into the target file
+	 */
+	private static void loadFile(String sourcePath, File targetFile) {
+		try (InputStream stream = Skript.getInstance().getResource(sourcePath)) {
+			if (stream == null) {
+				Skript.error("The " + sourcePath + " file doesn't exist and couldn't be read from the jar file.");
+				return;
+			}
+			Files.copy(stream, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+		} catch (IOException e) {
+			Skript.exception(e, "Error while loading a file from the jar file.");
+		}
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
new file mode 100644
index 00000000000..01513b62486
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
@@ -0,0 +1,63 @@
+package ch.njol.skript.lang.globals;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Config;
+import ch.njol.skript.structures.StructOptions;
+import ch.njol.util.StringUtils;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+/**
+ * Represents the 'globals/options.sk' file
+ */
+public class GlobalOptions extends GlobalFile {
+
+	private static final Map<String, String> options = new HashMap<>();
+
+	public GlobalOptions() {
+		super("options");
+	}
+
+	/**
+	 * Loads the 'globals/options.sk' file
+	 */
+	public void load() {
+		options.clear();
+		try {
+			Config config = new Config(file, true, false, ":");
+			config.getMainNode().convertToEntries(-1);
+			StructOptions.loadOptions(config.getMainNode(), "", options);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * @return An unmodifiable map of global options
+	 */
+	public static Map<String, String> getOptions() {
+		return Collections.unmodifiableMap(options);
+	}
+
+	/**
+	 * Replaces global options in a string
+	 */
+	public static String replaceOptions(String string) {
+		if (options.isEmpty()) { // don't bother
+			return string;
+		}
+		return StringUtils.replaceAll(string, "\\{@(.+?)\\}", m -> {
+			String option = GlobalOptions.getOptions().get(m.group(1));
+			if (option == null) {
+				Skript.error("undefined option " + m.group());
+				return m.group();
+			}
+			return Matcher.quoteReplacement(option);
+		});
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/structures/StructOptions.java b/src/main/java/ch/njol/skript/structures/StructOptions.java
index 122c7c1b800..665c240bf1b 100644
--- a/src/main/java/ch/njol/skript/structures/StructOptions.java
+++ b/src/main/java/ch/njol/skript/structures/StructOptions.java
@@ -8,14 +8,13 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.GlobalOptions;
+import ch.njol.skript.lang.globals.GlobalOptions;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.StringUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryContainer;
-import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.script.ScriptData;
 import org.skriptlang.skript.lang.structure.Structure;
 
@@ -64,7 +63,7 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 		return true;
 	}
 
-	private void loadOptions(SectionNode sectionNode, String prefix, Map<String, String> options) {
+	public static void loadOptions(SectionNode sectionNode, String prefix, Map<String, String> options) {
 		for (Node node : sectionNode) {
 			if (node instanceof EntryNode) {
 				options.put(prefix + node.getKey(), ((EntryNode) node).getValue());
diff --git a/src/main/resources/global-options.sk b/src/main/resources/globals/options.sk
similarity index 77%
rename from src/main/resources/global-options.sk
rename to src/main/resources/globals/options.sk
index 3fa84fdcb99..ff74890f36f 100644
--- a/src/main/resources/global-options.sk
+++ b/src/main/resources/globals/options.sk
@@ -2,9 +2,10 @@
 # This file lets you set options globally.
 # Options here will be available across all scripts.
 # Scripts can override a global option by creating an option with the same name as the global one.
-# When you edit this file, you must reload global-options and all script files that use global options.
+# When you edit this file, you must first reload global-options and then reload all the script files that use global options.
 #
 # Example usage of this file:
+#
 # server name: SkriptLand   # {@server name}
 # join messages:
 #   first join: %player% joined for the first time!   # {@join messages.first join}
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index 83957412cf8..b9e32a1dd76 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -19,6 +19,7 @@ skript:
 	finished loading: Finished loading.
 	warning message: It appears that /reload or another plugin reloaded Skript. This is not supported behaviour and may cause issues.
 	restart message: Please consider restarting the server instead.
+	global options: You must also reload any scripts that use global options for the changes to take effect.
 
 # -- Skript command --
 skript command:

From dacf7d2b4c872b2e4305a975c1acc64e764085d1 Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 18:49:34 +0300
Subject: [PATCH 05/11] rename loadFile

---
 src/main/java/ch/njol/skript/lang/globals/GlobalFile.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
index 6b8074b2213..b015528c575 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
@@ -20,14 +20,14 @@ public GlobalFile(String name) {
 		file = new File(Skript.getInstance().getDataFolder(), filePath);
 
 		if (!file.exists()) {
-			loadFile(filePath, file);
+			copyFile(filePath, file);
 		}
 	}
 
 	/**
-	 * Loads a file from the Skript jar into the target file
+	 * Copies a file from the Skript jar into the target file
 	 */
-	private static void loadFile(String sourcePath, File targetFile) {
+	private static void copyFile(String sourcePath, File targetFile) {
 		try (InputStream stream = Skript.getInstance().getResource(sourcePath)) {
 			if (stream == null) {
 				Skript.error("The " + sourcePath + " file doesn't exist and couldn't be read from the jar file.");

From a36781bec4c2137907e9df22cdab2f7670393169 Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 18:49:57 +0300
Subject: [PATCH 06/11] test

---
 .../java/ch/njol/skript/lang/globals/GlobalOptions.java   | 8 ++++++++
 src/test/skript/tests/misc/global-options.sk              | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 src/test/skript/tests/misc/global-options.sk

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
index 01513b62486..565158f4ed6 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
@@ -18,6 +18,14 @@ public class GlobalOptions extends GlobalFile {
 
 	private static final Map<String, String> options = new HashMap<>();
 
+	static {
+		// for unit tests
+		if (Skript.testing()) {
+			options.put("GlobalOptionTest", "works!!!");
+			options.put("GlobalOptionOverrideTest", "shouldn't work!!!");
+		}
+	}
+
 	public GlobalOptions() {
 		super("options");
 	}
diff --git a/src/test/skript/tests/misc/global-options.sk b/src/test/skript/tests/misc/global-options.sk
new file mode 100644
index 00000000000..0aa714d3ec1
--- /dev/null
+++ b/src/test/skript/tests/misc/global-options.sk
@@ -0,0 +1,6 @@
+options:
+	GlobalOptionOverrideTest: overridden!
+
+test "global options":
+	assert "{@GlobalOptionTest}" is "works!!!" with "global option didn't work"
+	assert "{@GlobalOptionOverrideTest}" is "overridden!" with "overriding global option didn't work"

From 5e353f0a31559eb30ed9cb81a80a7ea8816e6a00 Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 18:53:12 +0300
Subject: [PATCH 07/11] message

---
 src/main/java/ch/njol/skript/Skript.java        | 2 +-
 src/main/java/ch/njol/skript/SkriptCommand.java | 1 +
 src/main/resources/lang/english.lang            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 75c48e6245e..36ff54a4cdc 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -542,7 +542,7 @@ public void onEnable() {
 
 		File globalsFolder = new File(Skript.getInstance().getDataFolder(), "/globals/");
 		if (!globalsFolder.exists()) {
-			globalsFolder.mkdir(); // TODO - handle case where folder fails to be created ?
+			globalsFolder.mkdir();
 		}
 
  		new GlobalOptions().load();
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 3e24d3c7faf..fb6478127a4 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -175,6 +175,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 					reloading(sender, "global options", logHandler);
 					new GlobalOptions().load();
 					reloaded(sender, logHandler, timingLogHandler, "global options");
+					info(sender, "reload.global options");
 				} else { // Reloading an individual Script or folder
 					File scriptFile = getScriptFromArgs(sender, args);
 					if (scriptFile == null)
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index b9e32a1dd76..353de31bef8 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -19,7 +19,6 @@ skript:
 	finished loading: Finished loading.
 	warning message: It appears that /reload or another plugin reloaded Skript. This is not supported behaviour and may cause issues.
 	restart message: Please consider restarting the server instead.
-	global options: You must also reload any scripts that use global options for the changes to take effect.
 
 # -- Skript command --
 skript command:
@@ -66,6 +65,7 @@ skript command:
 		error details: <light red>    %s<reset>\n
 		other details: <white>    %s<reset>\n
 		line details: <gold>    Line: <gray>%s<reset>\n <reset>
+		global options: You must also reload any scripts that use global options for the changes to take effect.
 
 		config, aliases, global options and scripts: the config, aliases, global options and all scripts
 		scripts: all scripts

From 0bc5b07fb38e39983e14b63cf37638afb88fc54b Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 18:56:05 +0300
Subject: [PATCH 08/11] update exception

---
 src/main/java/ch/njol/skript/lang/globals/GlobalFile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
index b015528c575..2a31c5b0319 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalFile.java
@@ -35,7 +35,7 @@ private static void copyFile(String sourcePath, File targetFile) {
 			}
 			Files.copy(stream, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 		} catch (IOException e) {
-			Skript.exception(e, "Error while loading a file from the jar file.");
+			Skript.exception(e, "Error while loading the " + sourcePath + " file from the jar file.");
 		}
 	}
 

From c30f8ec74d00396e928952a2f0c0f95806db0f33 Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 19:16:14 +0300
Subject: [PATCH 09/11] fix test

---
 .../skript/lang/globals/GlobalOptions.java    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
index 565158f4ed6..75c6cbb9167 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
@@ -6,7 +6,6 @@
 import ch.njol.util.StringUtils;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -18,14 +17,6 @@ public class GlobalOptions extends GlobalFile {
 
 	private static final Map<String, String> options = new HashMap<>();
 
-	static {
-		// for unit tests
-		if (Skript.testing()) {
-			options.put("GlobalOptionTest", "works!!!");
-			options.put("GlobalOptionOverrideTest", "shouldn't work!!!");
-		}
-	}
-
 	public GlobalOptions() {
 		super("options");
 	}
@@ -39,16 +30,22 @@ public void load() {
 			Config config = new Config(file, true, false, ":");
 			config.getMainNode().convertToEntries(-1);
 			StructOptions.loadOptions(config.getMainNode(), "", options);
+
+			// for unit tests
+			if (Skript.testing()) {
+				options.put("GlobalOptionTest", "works!!!");
+				options.put("GlobalOptionOverrideTest", "shouldn't work!!!");
+			}
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
 	/**
-	 * @return An unmodifiable map of global options
+	 * @return A modifiable map of global options
 	 */
 	public static Map<String, String> getOptions() {
-		return Collections.unmodifiableMap(options);
+		return options;
 	}
 
 	/**

From f7815b6b23855f25258f34e15bfa832edf0750e0 Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 19:46:59 +0300
Subject: [PATCH 10/11] please work

---
 src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
index 75c6cbb9167..2d8eb329987 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
@@ -58,7 +58,6 @@ public static String replaceOptions(String string) {
 		return StringUtils.replaceAll(string, "\\{@(.+?)\\}", m -> {
 			String option = GlobalOptions.getOptions().get(m.group(1));
 			if (option == null) {
-				Skript.error("undefined option " + m.group());
 				return m.group();
 			}
 			return Matcher.quoteReplacement(option);

From 624120432fdc9b90845452cdb42a4de71c724dae Mon Sep 17 00:00:00 2001
From: Eren Kara <karaeren362@gmail.com>
Date: Wed, 15 Oct 2025 19:51:55 +0300
Subject: [PATCH 11/11] make getOptions() unmodifiable

---
 src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
index 2d8eb329987..1125cffdc57 100644
--- a/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
+++ b/src/main/java/ch/njol/skript/lang/globals/GlobalOptions.java
@@ -6,6 +6,7 @@
 import ch.njol.util.StringUtils;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -42,10 +43,10 @@ public void load() {
 	}
 
 	/**
-	 * @return A modifiable map of global options
+	 * @return An unmodifiable map of global options
 	 */
 	public static Map<String, String> getOptions() {
-		return options;
+		return Collections.unmodifiableMap(options);
 	}
 
 	/**