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

@@ -10,11 +10,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.mojang.serialization.Lifecycle;
@@ -24,14 +21,12 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.Registry;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.network.HandshakeMessages;
import net.minecraftforge.registries.ForgeRegistry.Snapshot;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.ApiStatus;
public class RegistryManager
{
public class RegistryManager {
private static final Logger LOGGER = LogManager.getLogger();
public static final RegistryManager ACTIVE = new RegistryManager("ACTIVE");
public static final RegistryManager VANILLA = new RegistryManager("VANILLA");
@@ -39,65 +34,61 @@ public class RegistryManager
private static Set<ResourceLocation> vanillaRegistryKeys = Set.of();
BiMap<ResourceLocation, ForgeRegistry<?>> registries = HashBiMap.create();
private Map<ResourceLocation, ? extends IForgeRegistry<?>> registryView = Collections.unmodifiableMap(registries);
private Set<ResourceLocation> persisted = Sets.newHashSet();
private Set<ResourceLocation> synced = Sets.newHashSet();
private Map<ResourceLocation, ResourceLocation> legacyNames = new HashMap<>();
private final String name;
RegistryManager()
{
RegistryManager() {
this("STAGING");
}
public RegistryManager(String name)
{
public RegistryManager(String name) {
this.name = name;
}
public String getName()
{
public String getName() {
return this.name;
}
boolean isStaging()
{
boolean isStaging() {
return "STAGING".equals(this.name);
}
@SuppressWarnings("unchecked")
public <V> ForgeRegistry<V> getRegistry(ResourceLocation key)
{
public <V> ForgeRegistry<V> getRegistry(ResourceLocation key) {
return (ForgeRegistry<V>)this.registries.get(key);
}
public <V> ForgeRegistry<V> getRegistry(ResourceKey<? extends Registry<V>> key)
{
public <V> ForgeRegistry<V> getRegistry(ResourceKey<? extends Registry<V>> key) {
return getRegistry(key.location());
}
public <V> ResourceLocation getName(IForgeRegistry<V> reg)
{
public <V> ResourceLocation getName(IForgeRegistry<V> reg) {
return this.registries.inverse().get(reg);
}
public <V> ResourceLocation updateLegacyName(ResourceLocation legacyName)
{
public Map<ResourceLocation, ? extends IForgeRegistry<?>> getRegistries() {
return this.registryView;
}
public static Set<ResourceLocation> getVanillaRegistryKeys() {
return vanillaRegistryKeys;
}
public <V> ResourceLocation updateLegacyName(ResourceLocation legacyName) {
ResourceLocation originalName = legacyName;
while (getRegistry(legacyName) == null)
{
while (getRegistry(legacyName) == null) {
legacyName = legacyNames.get(legacyName);
if (legacyName == null)
{
return originalName;
}
}
return legacyName;
}
public <V> ForgeRegistry<V> getRegistry(ResourceLocation key, RegistryManager other)
{
if (!this.registries.containsKey(key))
{
public <V> ForgeRegistry<V> getRegistry(ResourceLocation key, RegistryManager other) {
if (!this.registries.containsKey(key)) {
ForgeRegistry<V> ot = other.getRegistry(key);
if (ot == null)
return null;
@@ -113,8 +104,7 @@ public class RegistryManager
return getRegistry(key);
}
<V> ForgeRegistry<V> createRegistry(ResourceLocation name, RegistryBuilder<V> builder)
{
<V> ForgeRegistry<V> createRegistry(ResourceLocation name, RegistryBuilder<V> builder) {
if (registries.containsKey(name))
throw new IllegalArgumentException("Attempted to register a registry for " + name + " but it already exists");
ForgeRegistry<V> reg = new ForgeRegistry<V>(this, name, builder);
@@ -128,22 +118,19 @@ public class RegistryManager
return getRegistry(name);
}
static <V> void registerToRootRegistry(ForgeRegistry<V> forgeReg)
{
static <V> void registerToRootRegistry(ForgeRegistry<V> forgeReg) {
injectForgeRegistry(forgeReg, BuiltInRegistries.REGISTRY);
}
@SuppressWarnings("unchecked")
private static <V> void injectForgeRegistry(ForgeRegistry<V> forgeReg, Registry<? extends Registry<?>> rootRegistry)
{
private static <V> void injectForgeRegistry(ForgeRegistry<V> forgeReg, Registry<? extends Registry<?>> rootRegistry) {
WritableRegistry<Registry<V>> registry = (WritableRegistry<Registry<V>>) rootRegistry;
Registry<V> wrapper = forgeReg.getWrapper();
if (wrapper != null)
registry.register(forgeReg.getRegistryKey(), wrapper, Lifecycle.experimental());
}
public static void postNewRegistryEvent()
{
public static void postNewRegistryEvent() {
NewRegistryEvent event = new NewRegistryEvent();
DataPackRegistryEvent.NewRegistry dataPackEvent = new DataPackRegistryEvent.NewRegistry();
vanillaRegistryKeys = Set.copyOf(BuiltInRegistries.REGISTRY.keySet());
@@ -155,61 +142,29 @@ public class RegistryManager
dataPackEvent.process();
}
private void addLegacyName(ResourceLocation legacyName, ResourceLocation name)
{
private void addLegacyName(ResourceLocation legacyName, ResourceLocation name) {
if (this.legacyNames.containsKey(legacyName))
{
throw new IllegalArgumentException("Legacy name conflict for registry " + name + ", upgrade path must be linear: " + legacyName);
}
this.legacyNames.put(legacyName, name);
}
private void findSuperTypes(Class<?> type, Set<Class<?>> types)
{
if (type == null || type == Object.class)
{
return;
}
types.add(type);
for (Class<?> interfac : type.getInterfaces())
{
findSuperTypes(interfac, types);
}
findSuperTypes(type.getSuperclass(), types);
}
public Map<ResourceLocation, Snapshot> takeSnapshot(boolean savingToDisc)
{
Map<ResourceLocation, Snapshot> ret = Maps.newHashMap();
Set<ResourceLocation> keys = savingToDisc ? this.persisted : this.synced;
public Map<ResourceLocation, Snapshot> takeSnapshot(boolean savingToDisc) {
Map<ResourceLocation, Snapshot> ret = new HashMap<>();
var keys = savingToDisc ? this.persisted : this.synced;
keys.forEach(name -> ret.put(name, getRegistry(name).makeSnapshot()));
return ret;
}
//Public for testing only
public void clean()
{
@ApiStatus.Internal
public void clean() {
this.persisted.clear();
this.synced.clear();
this.registries.clear();
}
public static List<Pair<String, HandshakeMessages.S2CRegistry>> generateRegistryPackets(boolean isLocal)
{
return !isLocal ? ACTIVE.takeSnapshot(false).entrySet().stream().
map(e->Pair.of("Registry " + e.getKey(), new HandshakeMessages.S2CRegistry(e.getKey(), e.getValue()))).
collect(Collectors.toList()) : Collections.emptyList();
}
public static List<ResourceLocation> getRegistryNamesForSyncToClient()
{
return ACTIVE.registries.keySet().stream().
filter(resloc -> ACTIVE.synced.contains(resloc)).
collect(Collectors.toList());
}
public static Set<ResourceLocation> getVanillaRegistryKeys()
{
return vanillaRegistryKeys;
@ApiStatus.Internal
public static List<ResourceLocation> getRegistryNamesForSyncToClient() {
return ACTIVE.registries.keySet().stream().filter(ACTIVE.synced::contains).toList();
}
}