3232import net .minecraft .client .renderer .item .properties .conditional .ConditionalItemModelProperties ;
3333import net .minecraft .resources .Identifier ;
3434import net .minecraft .server .level .ServerPlayer ;
35+ import net .minecraft .server .packs .resources .PreparableReloadListener ;
3536import net .minecraft .world .InteractionResult ;
3637import net .minecraft .world .level .Level ;
3738import net .neoforged .api .distmarker .Dist ;
4849import net .neoforged .neoforge .client .gui .VanillaGuiLayers ;
4950import net .neoforged .neoforge .common .NeoForge ;
5051import net .neoforged .neoforge .event .AddServerReloadListenersEvent ;
52+ import net .neoforged .neoforge .resource .ContextAwareReloadListener ;
5153import net .neoforged .neoforge .event .OnDatapackSyncEvent ;
5254import net .neoforged .neoforge .event .RegisterCommandsEvent ;
5355import net .neoforged .neoforge .event .entity .EntityJoinLevelEvent ;
5658import net .neoforged .neoforge .event .level .LevelEvent ;
5759import net .neoforged .neoforge .event .tick .ServerTickEvent ;
5860
61+ import java .util .concurrent .CompletableFuture ;
62+ import java .util .concurrent .Executor ;
63+
5964@ Mod (Modonomicon .MOD_ID )
6065public class ModonomiconNeo {
6166
@@ -80,11 +85,21 @@ public ModonomiconNeo(IEventBus modEventBus, ModContainer modContainer) {
8085
8186 //register data managers as reload listeners
8287 NeoForge .EVENT_BUS .addListener ((AddServerReloadListenersEvent e ) -> {
83- BookDataManager .get ().registries (e .getRegistryAccess ());
84- e .addListener (Modonomicon .loc ("book_data_manager" ), BookDataManager .get ());
88+ e .addListener (Modonomicon .loc ("book_data_manager" ), new ContextAwareReloadListener () {
89+ @ Override
90+ public CompletableFuture <Void > reload (PreparableReloadListener .SharedState currentReload , Executor taskExecutor , PreparableReloadListener .PreparationBarrier preparationBarrier , Executor reloadExecutor ) {
91+ BookDataManager .get ().registries (this .getRegistryLookup ());
92+ return BookDataManager .get ().reload (currentReload , taskExecutor , preparationBarrier , reloadExecutor );
93+ }
94+ });
8595
86- MultiblockDataManager .get ().registries (e .getRegistryAccess ());
87- e .addListener (Modonomicon .loc ("multiblock_data_manager" ), MultiblockDataManager .get ());
96+ e .addListener (Modonomicon .loc ("multiblock_data_manager" ), new ContextAwareReloadListener () {
97+ @ Override
98+ public CompletableFuture <Void > reload (PreparableReloadListener .SharedState currentReload , Executor taskExecutor , PreparableReloadListener .PreparationBarrier preparationBarrier , Executor reloadExecutor ) {
99+ MultiblockDataManager .get ().registries (this .getRegistryLookup ());
100+ return MultiblockDataManager .get ().reload (currentReload , taskExecutor , preparationBarrier , reloadExecutor );
101+ }
102+ });
88103 });
89104
90105 //register commands
0 commit comments