From 7f88b8e0991696a4d9a5e108832732de6a297bf7 Mon Sep 17 00:00:00 2001
From: LatvianModder <latvianmodder@gmail.com>
Date: Tue, 23 Jul 2024 23:44:09 +0300
Subject: [PATCH] Moved registry event firing to RegisterEvent handler.
 Hopefully doesn't break anything

---
 src/main/java/dev/latvian/mods/kubejs/KubeJS.java           | 6 ------
 .../latvian/mods/kubejs/registry/RegistryEventHandler.java  | 4 ++++
 src/main/java/dev/latvian/mods/kubejs/util/UtilsJS.java     | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/dev/latvian/mods/kubejs/KubeJS.java b/src/main/java/dev/latvian/mods/kubejs/KubeJS.java
index 621988715..defa28418 100644
--- a/src/main/java/dev/latvian/mods/kubejs/KubeJS.java
+++ b/src/main/java/dev/latvian/mods/kubejs/KubeJS.java
@@ -15,7 +15,6 @@
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugins;
 import dev.latvian.mods.kubejs.recipe.KubeJSRecipeSerializers;
-import dev.latvian.mods.kubejs.registry.RegistryKubeEvent;
 import dev.latvian.mods.kubejs.registry.RegistryType;
 import dev.latvian.mods.kubejs.script.ConsoleJS;
 import dev.latvian.mods.kubejs.script.ConsoleLine;
@@ -30,7 +29,6 @@
 import dev.latvian.mods.kubejs.util.RecordDefaults;
 import dev.latvian.mods.kubejs.util.UtilsJS;
 import net.minecraft.Util;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.neoforged.api.distmarker.Dist;
@@ -159,10 +157,6 @@ public KubeJS(IEventBus bus, Dist dist, ModContainer mod) throws Throwable {
 
 		KubeJSPlugins.forEachPlugin(KubeJSPlugin::initStartup);
 
-		for (var key : StartupEvents.REGISTRY.findUniqueExtraIds(ScriptType.STARTUP)) {
-			StartupEvents.REGISTRY.post(new RegistryKubeEvent<>((ResourceKey) key), key);
-		}
-
 		if (dist.isClient()) {
 			KubeFileResourcePack.scanForInvalidFiles("kubejs/assets/", KubeJSPaths.ASSETS);
 		}
diff --git a/src/main/java/dev/latvian/mods/kubejs/registry/RegistryEventHandler.java b/src/main/java/dev/latvian/mods/kubejs/registry/RegistryEventHandler.java
index 72717cf6c..265d7d5b1 100644
--- a/src/main/java/dev/latvian/mods/kubejs/registry/RegistryEventHandler.java
+++ b/src/main/java/dev/latvian/mods/kubejs/registry/RegistryEventHandler.java
@@ -2,7 +2,9 @@
 
 import dev.latvian.mods.kubejs.DevProperties;
 import dev.latvian.mods.kubejs.KubeJS;
+import dev.latvian.mods.kubejs.bindings.event.StartupEvents;
 import dev.latvian.mods.kubejs.script.ConsoleJS;
+import dev.latvian.mods.kubejs.script.ScriptType;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.neoforged.bus.api.EventPriority;
@@ -19,6 +21,8 @@ public static void registerAll(RegisterEvent event) {
 	}
 
 	private static <T> void handleRegistryEvent(ResourceKey<Registry<T>> registryKey, RegisterEvent event) {
+		StartupEvents.REGISTRY.post(ScriptType.STARTUP, (ResourceKey) registryKey, new RegistryKubeEvent<>(registryKey));
+
 		var objStorage = RegistryObjectStorage.of(registryKey);
 
 		if (objStorage.objects.isEmpty()) {
diff --git a/src/main/java/dev/latvian/mods/kubejs/util/UtilsJS.java b/src/main/java/dev/latvian/mods/kubejs/util/UtilsJS.java
index c1558c57b..271e70963 100644
--- a/src/main/java/dev/latvian/mods/kubejs/util/UtilsJS.java
+++ b/src/main/java/dev/latvian/mods/kubejs/util/UtilsJS.java
@@ -40,7 +40,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.Consumer;