Skip to content

Commit 5b860a2

Browse files
authored
Post after recipes (#1102)
* Post afterRecipes event after recipes are loaded * Clean dead 1.17 code
1 parent d4a217d commit 5b860a2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

common/src/main/java/dev/latvian/mods/kubejs/core/MinecraftServerKJS.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import dev.latvian.mods.kubejs.player.AdvancementJS;
66
import dev.latvian.mods.kubejs.player.EntityArrayList;
77
import dev.latvian.mods.kubejs.server.DataExport;
8+
import dev.latvian.mods.kubejs.server.KubeJSReloadListener;
89
import dev.latvian.mods.kubejs.util.ConsoleJS;
910
import dev.latvian.mods.rhino.util.HideFromJS;
1011
import dev.latvian.mods.rhino.util.RemapPrefixForJS;
@@ -100,6 +101,8 @@ public interface MinecraftServerKJS extends WithAttachedData<MinecraftServer>, W
100101

101102
@HideFromJS
102103
default void kjs$afterResourcesLoaded(boolean reload) {
104+
KubeJSReloadListener.postAfterRecipes();
105+
103106
if (reload) {
104107
DataExport.exportData();
105108
}

common/src/main/java/dev/latvian/mods/kubejs/server/KubeJSReloadListener.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import dev.latvian.mods.kubejs.recipe.AfterRecipesLoadedEventJS;
55
import dev.latvian.mods.kubejs.script.ScriptType;
66
import net.minecraft.server.ReloadableServerResources;
7-
import net.minecraft.server.packs.resources.ResourceManager;
8-
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
97

10-
public class KubeJSReloadListener implements ResourceManagerReloadListener {
8+
public class KubeJSReloadListener {
119
public static ReloadableServerResources resources;
1210
public static Object recipeContext; // Forge
1311

14-
@Override
15-
public void onResourceManagerReload(ResourceManager resourceManager) {
12+
public static void postAfterRecipes() {
1613
var recipeManager = resources == null ? null : resources.getRecipeManager();
1714

1815
if (recipeManager != null && ServerEvents.RECIPES_AFTER_LOADED.hasListeners()) {

0 commit comments

Comments
 (0)