diff --git a/patches/minecraft/net/minecraft/resources/DataPackRegistries.java.patch b/patches/minecraft/net/minecraft/resources/DataPackRegistries.java.patch index 5b5f5ba785..d3cf8f9c5d 100644 --- a/patches/minecraft/net/minecraft/resources/DataPackRegistries.java.patch +++ b/patches/minecraft/net/minecraft/resources/DataPackRegistries.java.patch @@ -4,7 +4,7 @@ this.field_240952_b_.func_219534_a(this.field_240957_g_); this.field_240952_b_.func_219534_a(this.field_240959_i_); this.field_240952_b_.func_219534_a(this.field_240958_h_); -+ net.minecraftforge.event.ForgeEventFactory.onResourceReload().forEach(field_240952_b_::func_219534_a); ++ net.minecraftforge.event.ForgeEventFactory.onResourceReload(this).forEach(field_240952_b_::func_219534_a); } public FunctionReloader func_240960_a_() { diff --git a/src/main/java/net/minecraftforge/event/AddReloadListenerEvent.java b/src/main/java/net/minecraftforge/event/AddReloadListenerEvent.java index c6941f4e66..9b0ab446e2 100644 --- a/src/main/java/net/minecraftforge/event/AddReloadListenerEvent.java +++ b/src/main/java/net/minecraftforge/event/AddReloadListenerEvent.java @@ -17,8 +17,14 @@ import java.util.List; */ public class AddReloadListenerEvent extends Event { - private final List listeners = new ArrayList<>(); - + private final List listeners = new ArrayList<>(); + private final DataPackRegistries dataPackRegistries; + + public AddReloadListenerEvent(DataPackRegistries dataPackRegistries) + { + this.dataPackRegistries = dataPackRegistries; + } + /** * @param listener the listener to add to the ResourceManager on reload */ @@ -31,4 +37,9 @@ public class AddReloadListenerEvent extends Event { return ImmutableList.copyOf(listeners); } + + public DataPackRegistries getDataPackRegistries() + { + return dataPackRegistries; + } } diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 8060db7abe..3ba4f56abf 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -52,6 +52,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.loot.LootTable; import net.minecraft.loot.LootTableManager; import net.minecraft.resources.IFutureReloadListener; +import net.minecraft.resources.DataPackRegistries; import net.minecraft.world.spawner.AbstractSpawner; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -724,9 +725,9 @@ public class ForgeEventFactory return event.getNewTime(); } - public static List onResourceReload() + public static List onResourceReload(DataPackRegistries dataPackRegistries) { - AddReloadListenerEvent event = new AddReloadListenerEvent(); + AddReloadListenerEvent event = new AddReloadListenerEvent(dataPackRegistries); MinecraftForge.EVENT_BUS.post(event); return event.getListeners(); }