Update for Denizen-Core script loading changes

Author: tal5

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

@@ -82,6 +82,9 @@ public void onInitializeClient() {
 			scriptsFolder.mkdirs();
 		}
 
+		// Load all scripts in
+		DenizenCore.reloadScripts(false, null);
+
 		// Tick Denizen-Core
 		ClientTickEvents.START_CLIENT_TICK.register(client -> DenizenCore.tick(50));
 
@@ -90,8 +93,8 @@ public void onInitializeClient() {
 
 		// Remove scripts received from the server once the client disconnects from it
 		ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> {
-			ScriptHelper.additionalScripts.clear();
-			DenizenCore.reloadScripts();
+			ScriptHelper.buildAdditionalScripts.clear();
+			DenizenCore.reloadScripts(false, null);
 		});
 	}
 }

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

@@ -2,21 +2,17 @@
 
 import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.scripts.ScriptHelper;
-import com.denizenscript.denizencore.utilities.ReflectionHelper;
 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.HashMap;
 import java.util.Map;
 
 public class NetworkManager {
 
-	public static final Map<String, String> scriptSources = ReflectionHelper.getFieldValue(ScriptHelper.class, "scriptSources", null);
-
 	public static void init() {
 		Debug.log("Initializing NetworkManager...");
 		ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
@@ -26,17 +22,13 @@ public static void init() {
 
 		// Register receivers
 		registerInChannel(Channels.SET_SCRIPTS, (message) -> {
-			Map<String, String> scripts = message.readStringMap();
+			Map<String, String> scriptsMap = message.readStringMap();
 			DenizenCore.runOnMainThread(() -> {
-				ScriptHelper.additionalScripts.clear();
-				scriptSources.clear();
-				for (Map.Entry<String, String> entry : scripts.entrySet()) {
-					ScriptHelper.additionalScripts.add(YamlConfiguration.load(ScriptHelper.clearComments(entry.getKey(), entry.getValue(), true)));
+				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))));
 				}
-				Map<String, String> backupSources = new HashMap<>(scriptSources);
-				DenizenCore.reloadScripts();
-				// TODO: this is a temporary hack, should be properly fixed in core / Clientizen
-				scriptSources.putAll(backupSources);
+				DenizenCore.reloadScripts(true, null);
 			});
 		});
 	}

src/main/java/com/denizenscript/clientizen/util/impl/DenizenCoreImpl.java

@@ -184,4 +184,10 @@ public void doFinalDebugOutput(String text) {
 	public String stripColor(String text) {
 		return Formatting.strip(text);
 	}
+
+	@Override
+	public void reloadConfig() {}
+
+	@Override
+	public void reloadSaves() {}
 }