Skip to content

Commit 715227f

Browse files
committed
refactor(26.3): Resolve Fabric deprecation ResourceManagerHelper -> Data/-ResourceLoader
1 parent 0e98aa7 commit 715227f

1 file changed

Lines changed: 4 additions & 29 deletions

File tree

fabric/src/main/java/net/blay09/mods/balm/fabric/server/packs/resources/internal/FabricBalmResourceReloadListenerRegistrar.java

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package net.blay09.mods.balm.fabric.server.packs.resources.internal;
22

33
import net.blay09.mods.balm.server.packs.resources.BalmResourceReloadListenerRegistrar;
4-
import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
5-
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
4+
import net.fabricmc.fabric.api.resource.v1.DataResourceLoader;
65
import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
76
import net.fabricmc.fabric.api.resource.v1.reloader.ResourceReloaderKeys;
87
import net.minecraft.core.HolderLookup;
98
import net.minecraft.resources.Identifier;
109
import net.minecraft.server.packs.PackType;
1110
import net.minecraft.server.packs.resources.PreparableReloadListener;
1211
import net.minecraft.server.packs.resources.ResourceManager;
13-
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
12+
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
1413

15-
import java.util.concurrent.CompletableFuture;
16-
import java.util.concurrent.Executor;
1714
import java.util.function.Consumer;
1815
import java.util.function.Function;
1916

@@ -34,35 +31,13 @@ public FabricBalmResourceReloadListenerRegistrar(String namespace) {
3431
@Override
3532
public void register(String name, Function<HolderLookup.Provider, PreparableReloadListener> listenerFactory) {
3633
final var identifier = Identifier.fromNamespaceAndPath(namespace, name);
37-
ResourceManagerHelper.get(PackType.SERVER_DATA).registerReloadListener(identifier, providers -> new IdentifiableResourceReloadListener() {
38-
private final PreparableReloadListener listener = listenerFactory.apply(providers);
39-
40-
@Override
41-
public Identifier getFabricId() {
42-
return identifier;
43-
}
44-
45-
@Override
46-
public CompletableFuture<Void> reload(SharedState sharedState, Executor executor, PreparationBarrier preparationBarrier, Executor executor2) {
47-
return listener.reload(sharedState, executor, preparationBarrier, executor2);
48-
}
49-
});
34+
DataResourceLoader.get().registerReloadListener(identifier, listenerFactory);
5035
}
5136

5237
@Override
5338
public void register(String name, Consumer<ResourceManager> reloadListener) {
5439
final var identifier = Identifier.fromNamespaceAndPath(namespace, name);
55-
ResourceManagerHelper.get(PackType.SERVER_DATA).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
56-
@Override
57-
public void onResourceManagerReload(ResourceManager resourceManager) {
58-
reloadListener.accept(resourceManager);
59-
}
60-
61-
@Override
62-
public Identifier getFabricId() {
63-
return identifier;
64-
}
65-
});
40+
ResourceLoader.get(PackType.SERVER_DATA).registerReloadListener(identifier, (ResourceManagerReloadListener) reloadListener::accept);
6641
}
6742

6843
@Override

0 commit comments

Comments
 (0)