Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933)

This commit is contained in:
Jared authored and GitHub committed 2020-07-08 14:24:01 -07:00
1 parent 60ee0bcdb3
commit e4ffbeb329
3 files changed
+17 -5

No files matched your search

@@ -17,8 +17,14 @@ import java.util.List;
*/
public class AddReloadListenerEvent extends Event
{
private final List<IFutureReloadListener> listeners = new ArrayList<>();
private final List<IFutureReloadListener> 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;
}
}
@@ -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<IFutureReloadListener> onResourceReload()
public static List<IFutureReloadListener> onResourceReload(DataPackRegistries dataPackRegistries)
{
AddReloadListenerEvent event = new AddReloadListenerEvent();
AddReloadListenerEvent event = new AddReloadListenerEvent(dataPackRegistries);
MinecraftForge.EVENT_BUS.post(event);
return event.getListeners();
}