mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Fix datapack registries not being synced to clients (#9219)
This commit is contained in:
1 parent
ad59985a9b
commit
ae954bea17
5 files changed
+37
-2
No files matched your search
@@ -5,15 +5,20 @@
|
||||
|
||||
package net.minecraftforge.registries;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.RegistrySynchronization;
|
||||
import net.minecraft.resources.RegistryDataLoader;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@ApiStatus.Internal
|
||||
@@ -21,18 +26,33 @@ public final class DataPackRegistriesHooks
|
||||
{
|
||||
private DataPackRegistriesHooks() {} // utility class
|
||||
|
||||
private static final Map<ResourceKey<? extends Registry<?>>, RegistrySynchronization.NetworkedRegistryData<?>> NETWORKABLE_REGISTRIES = new LinkedHashMap<>();
|
||||
private static final List<RegistryDataLoader.RegistryData<?>> DATA_PACK_REGISTRIES = new ArrayList<>(RegistryDataLoader.WORLDGEN_REGISTRIES);
|
||||
private static final List<RegistryDataLoader.RegistryData<?>> DATA_PACK_REGISTRIES_VIEW = Collections.unmodifiableList(DATA_PACK_REGISTRIES);
|
||||
private static final Set<ResourceKey<? extends Registry<?>>> SYNCED_CUSTOM_REGISTRIES = new HashSet<>();
|
||||
private static final Set<ResourceKey<? extends Registry<?>>> SYNCED_CUSTOM_REGISTRIES_VIEW = Collections.unmodifiableSet(SYNCED_CUSTOM_REGISTRIES);
|
||||
|
||||
/* Internal forge hook for retaining mutable access to RegistryAccess's codec registry when it bootstraps. */
|
||||
public static Map<ResourceKey<? extends Registry<?>>, RegistrySynchronization.NetworkedRegistryData<?>> grabNetworkableRegistries(ImmutableMap.Builder<ResourceKey<? extends Registry<?>>, RegistrySynchronization.NetworkedRegistryData<?>> builder)
|
||||
{
|
||||
if (!StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass().equals(RegistrySynchronization.class))
|
||||
throw new IllegalCallerException("Attempted to call DataPackRegistriesHooks#grabNetworkableRegistries!");
|
||||
NETWORKABLE_REGISTRIES.forEach(builder::put);
|
||||
NETWORKABLE_REGISTRIES.clear();
|
||||
NETWORKABLE_REGISTRIES.putAll(builder.build());
|
||||
return Collections.unmodifiableMap(NETWORKABLE_REGISTRIES);
|
||||
}
|
||||
|
||||
/* Internal forge method, registers a datapack registry codec and folder. */
|
||||
static <T> void addRegistryCodec(DataPackRegistryEvent.DataPackRegistryData<T> data)
|
||||
{
|
||||
RegistryDataLoader.RegistryData<T> loaderData = data.loaderData();
|
||||
DATA_PACK_REGISTRIES.add(loaderData);
|
||||
if (data.networkCodec() != null)
|
||||
{
|
||||
SYNCED_CUSTOM_REGISTRIES.add(loaderData.key());
|
||||
NETWORKABLE_REGISTRIES.put(loaderData.key(), new RegistrySynchronization.NetworkedRegistryData<>(loaderData.key(), data.networkCodec()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,4 +73,4 @@ public final class DataPackRegistriesHooks
|
||||
{
|
||||
return SYNCED_CUSTOM_REGISTRIES_VIEW;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user