Cleanup script loading, support clientrun command (#13)

* Initial work

* Cleanup scipt loading, async safety, queue id

* Support sending nullable data, `path` is nullable

* `ClientScriptHelper` to `ClientScriptHandler`

Author: tal5

src/main/java/com/denizenscript/clientizen/Clientizen.java

@@ -4,6 +4,7 @@
 import com.denizenscript.clientizen.events.ClientizenScriptEventRegistry;
 import com.denizenscript.clientizen.network.NetworkManager;
 import com.denizenscript.clientizen.objects.ClientizenObjectRegistry;
+import com.denizenscript.clientizen.scripts.ClientScriptHandler;
 import com.denizenscript.clientizen.scripts.commands.ClientizenCommandRegistry;
 import com.denizenscript.clientizen.scripts.containers.ClientizenContainerRegistry;
 import com.denizenscript.clientizen.tags.ClientizenTagContext;
@@ -74,6 +75,7 @@ public void onInitializeClient() {
 		// Initialize Clientizen systems
 		NetworkManager.init();
 		ClientizenDebugScreen.register();
+		ClientScriptHandler.init();
 
 		// Check for the client scripts folder
 		File scriptsFolder = DenizenCore.implementation.getScriptFolder();

src/main/java/com/denizenscript/clientizen/network/Channels.java

@@ -7,4 +7,5 @@ public class Channels {
 	public static final Identifier SEND_CONFIRM = Clientizen.id("receive_confirmation");
 	public static final Identifier SET_SCRIPTS = Clientizen.id("set_scripts");
 	public static final Identifier FIRE_EVENT = Clientizen.id("fire_event");
+	public static final Identifier RUN_SCRIPT = Clientizen.id("run_script");
 }

src/main/java/com/denizenscript/clientizen/network/DataDeserializer.java

@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 public class DataDeserializer {
 
@@ -16,6 +17,10 @@ public DataDeserializer(ByteBuf buf) {
 		this.buf = buf;
 	}
 
+	public boolean readBoolean() {
+		return buf.readBoolean();
+	}
+
 	public int readInt() {
 		return buf.readInt();
 	}
@@ -69,4 +74,8 @@ public Map<String, List<String>> readStringListMap() {
 		}
 		return stringListMap;
 	}
+
+	public <T> T readNullable(Supplier<T> readMethod) {
+		return readBoolean() ? readMethod.get() : null;
+	}
 }

src/main/java/com/denizenscript/clientizen/network/NetworkManager.java

@@ -1,16 +1,11 @@
 package com.denizenscript.clientizen.network;
 
-import com.denizenscript.denizencore.DenizenCore;
-import com.denizenscript.denizencore.scripts.ScriptHelper;
-import com.denizenscript.denizencore.utilities.YamlConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.minecraft.util.Identifier;
 
-import java.util.Map;
-
 public class NetworkManager {
 
 	public static void init() {
@@ -19,18 +14,6 @@ public static void init() {
 			Debug.log("Sending join confirmation packet...");
 			send(Channels.SEND_CONFIRM, null);
 		}));
-
-		// Register receivers
-		registerInChannel(Channels.SET_SCRIPTS, (message) -> {
-			Map<String, String> scriptsMap = message.readStringMap();
-			DenizenCore.runOnMainThread(() -> {
-				ScriptHelper.buildAdditionalScripts.clear();
-				for (Map.Entry<String, String> entry : scriptsMap.entrySet()) {
-					ScriptHelper.buildAdditionalScripts.add(scripts -> scripts.add(YamlConfiguration.load(ScriptHelper.clearComments(entry.getKey(), entry.getValue(), true))));
-				}
-				DenizenCore.reloadScripts(true, null);
-			});
-		});
 	}
 
 	public static void registerInChannel(Identifier channel, ClientizenReceiver receiver) {

src/main/java/com/denizenscript/clientizen/scripts/ClientScriptHandler.java

@@ -0,0 +1,57 @@
+package com.denizenscript.clientizen.scripts;
+
+import com.denizenscript.clientizen.network.Channels;
+import com.denizenscript.clientizen.network.DataDeserializer;
+import com.denizenscript.clientizen.network.NetworkManager;
+import com.denizenscript.denizencore.DenizenCore;
+import com.denizenscript.denizencore.objects.ObjectFetcher;
+import com.denizenscript.denizencore.objects.core.ScriptTag;
+import com.denizenscript.denizencore.scripts.ScriptHelper;
+import com.denizenscript.denizencore.tags.TagContext;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
+import com.denizenscript.denizencore.utilities.CoreUtilities;
+import com.denizenscript.denizencore.utilities.ScriptUtilities;
+import com.denizenscript.denizencore.utilities.YamlConfiguration;
+import com.denizenscript.denizencore.utilities.debugging.Debug;
+
+import java.util.Map;
+
+public class ClientScriptHandler {
+
+	public static void init() {
+		NetworkManager.registerInChannel(Channels.SET_SCRIPTS, ClientScriptHandler::loadScriptsFrom);
+		NetworkManager.registerInChannel(Channels.RUN_SCRIPT, ClientScriptHandler::handleScriptRun);
+	}
+
+	public static void loadScriptsFrom(DataDeserializer data) {
+		Map<String, String> scriptsMap = data.readStringMap();
+		DenizenCore.runOnMainThread(() -> {
+			ScriptHelper.buildAdditionalScripts.clear();
+			for (Map.Entry<String, String> entry : scriptsMap.entrySet()) {
+				ScriptHelper.buildAdditionalScripts.add(scripts -> scripts.add(YamlConfiguration.load(ScriptHelper.clearComments(entry.getKey(), entry.getValue(), true))));
+			}
+			DenizenCore.reloadScripts(true, null);
+		});
+	}
+
+	public static void handleScriptRun(DataDeserializer data) {
+		String scriptStr = data.readString();
+		String path = data.readNullable(data::readString);
+		Map<String, String> defMap = data.readStringMap();
+		DenizenCore.runOnMainThread(() -> {
+			ScriptTag script = ScriptTag.valueOf(scriptStr, CoreUtilities.noDebugContext);
+			if (script == null) {
+				if (CoreConfiguration.debugExtraInfo) {
+					Debug.echoError("Invalid script name to run received from server: " + scriptStr + ".");
+				}
+				return;
+			}
+			ScriptUtilities.createAndStartQueue(script.getContainer(), path, null, null, queue -> {
+				TagContext context = DenizenCore.implementation.getTagContext(script.getContainer());
+				for (Map.Entry<String, String> entry : defMap.entrySet()) {
+					queue.addDefinition(entry.getKey(), ObjectFetcher.pickObjectFor(entry.getValue(), context));
+				}
+			}, null, "SERVER_RUN:" + script.getContainer().getName(), null, null);
+		});
+	}
+}