Rewrite networking.

This commit is contained in:
LexManos committed 2023-09-10 20:27:15 -07:00
1 parent 3edefbe33e
commit 4649f7af36
103 files changed
+4399 -5303

No files matched your search

@@ -14,7 +14,6 @@ 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;
@@ -23,8 +22,7 @@ import java.util.Set;
import java.util.stream.Stream;
@ApiStatus.Internal
public final class DataPackRegistriesHooks
{
public final class DataPackRegistriesHooks {
private DataPackRegistriesHooks() {} // utility class
private static final Map<ResourceKey<? extends Registry<?>>, RegistrySynchronization.NetworkedRegistryData<?>> NETWORKABLE_REGISTRIES = new LinkedHashMap<>();
@@ -34,8 +32,7 @@ public final class DataPackRegistriesHooks
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)
{
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);
@@ -45,12 +42,10 @@ public final class DataPackRegistriesHooks
}
/* Internal forge method, registers a datapack registry codec and folder. */
static <T> void addRegistryCodec(DataPackRegistryEvent.DataPackRegistryData<T> data)
{
static <T> void addRegistryCodec(DataPackRegistryEvent.DataPackRegistryData<T> data) {
RegistryDataLoader.RegistryData<T> loaderData = data.loaderData();
DATA_PACK_REGISTRIES.add(loaderData);
if (data.networkCodec() != null)
{
if (data.networkCodec() != null) {
SYNCED_CUSTOM_REGISTRIES.add(loaderData.key());
NETWORKABLE_REGISTRIES.put(loaderData.key(), new RegistrySynchronization.NetworkedRegistryData<>(loaderData.key(), data.networkCodec()));
}
@@ -60,8 +55,7 @@ public final class DataPackRegistriesHooks
* {@return An unmodifiable view of the list of datapack registries}.
* These registries are loaded from per-world datapacks on server startup.
*/
public static List<RegistryDataLoader.RegistryData<?>> getDataPackRegistries()
{
public static List<RegistryDataLoader.RegistryData<?>> getDataPackRegistries() {
return DATA_PACK_REGISTRIES_VIEW;
}
@@ -74,8 +68,7 @@ public final class DataPackRegistriesHooks
* Clients must have each of a server's synced datapack registries to be able to connect to that server;
* vanilla clients therefore cannot connect if this list is non-empty on the server.
*/
public static Set<ResourceKey<? extends Registry<?>>> getSyncedCustomRegistries()
{
public static Set<ResourceKey<? extends Registry<?>>> getSyncedCustomRegistries() {
return SYNCED_CUSTOM_REGISTRIES_VIEW;
}
}