diff --git a/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java b/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java index 5e23fc0c..b9a1bc88 100644 --- a/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java +++ b/common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java @@ -47,7 +47,7 @@ public final void bind(boolean throwOnMissingRegistry) { Registry registry = (Registry) getRegistry(); if (registry != null) { - this.holder = registry.get((ResourceKey) this.key).orElse(null); + this.holder = registry.getHolder((ResourceKey) this.key).orElse(null); } else if (throwOnMissingRegistry) { throw new IllegalStateException("Registry not present for " + this + ": " + this.key.registry()); } @@ -62,7 +62,7 @@ public ResourceKey> getRegistryKey() { } public Registry getRegistry() { - return BuiltInRegistries.REGISTRY.getValue(getKey().registry()); + return BuiltInRegistries.REGISTRY.get(getKey().registry()); } public ResourceLocation getId() { diff --git a/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java b/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java index c82a25f3..3179b1d0 100644 --- a/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java +++ b/fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java @@ -24,6 +24,7 @@ import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.resources.PreparableReloadListener; import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.util.profiling.ProfilerFiller; import java.util.Collection; import java.util.List; @@ -57,8 +58,9 @@ public ResourceLocation getFabricId() { } @Override - public CompletableFuture reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, Executor executor, Executor executor2) { - return listener.reload(preparationBarrier, resourceManager, executor, executor2); + public CompletableFuture reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, ProfilerFiller preparationsProfiler, ProfilerFiller reloadProfiler, + Executor executor, Executor executor2) { + return listener.reload(preparationBarrier, resourceManager, preparationsProfiler, reloadProfiler, executor, executor2); } @Override