Moved registry event firing to RegisterEvent handler. Hopefully doesn…

…'t break anything
KubeJS-Mods · Jul 23, 2024 · 7f88b8e · 7f88b8e
1 parent 1e8750a
commit 7f88b8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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;