Serializers of registry types now run through the platform native registry code.

Author: Darkhax

Common/src/main/java/net/darkhax/bookshelf/api/serialization/SerializerRegistryEntry.java

@@ -1,16 +1,16 @@
 package net.darkhax.bookshelf.api.serialization;
 
 import com.google.gson.JsonElement;
-import net.minecraft.core.Registry;
+import net.darkhax.bookshelf.api.registry.IRegistryReader;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
 public class SerializerRegistryEntry<T> implements ISerializer<T> {
 
-    private final Registry<T> registry;
+    private final IRegistryReader<T> registry;
 
-    public SerializerRegistryEntry(Registry<T> registry) {
+    public SerializerRegistryEntry(IRegistryReader<T> registry) {
 
         this.registry = registry;
     }
@@ -25,7 +25,7 @@ public T fromJSON(JsonElement json) {
     @Override
     public JsonElement toJSON(T toWrite) {
 
-        return Serializers.RESOURCE_LOCATION.toJSON(registry.getKey(toWrite));
+        return Serializers.RESOURCE_LOCATION.toJSON(registry.getId(toWrite));
     }
 
     @Override
@@ -38,13 +38,13 @@ public T fromByteBuf(FriendlyByteBuf buffer) {
     @Override
     public void toByteBuf(FriendlyByteBuf buffer, T toWrite) {
 
-        Serializers.RESOURCE_LOCATION.toByteBuf(buffer, registry.getKey(toWrite));
+        Serializers.RESOURCE_LOCATION.toByteBuf(buffer, registry.getId(toWrite));
     }
 
     @Override
     public Tag toNBT(T toWrite) {
 
-        return Serializers.RESOURCE_LOCATION.toNBT(registry.getKey(toWrite));
+        return Serializers.RESOURCE_LOCATION.toNBT(registry.getId(toWrite));
     }
 
     @Override

Common/src/main/java/net/darkhax/bookshelf/api/serialization/Serializers.java

@@ -1,7 +1,7 @@
 package net.darkhax.bookshelf.api.serialization;
 
+import net.darkhax.bookshelf.api.Services;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -59,19 +59,19 @@ public final class Serializers {
     public static final ISerializer<AttributeModifier.Operation> ATTRIBUTE_OPERATION = new SerializerEnum<>(AttributeModifier.Operation.class);
 
     // REGISTRY TYPES
-    public static final ISerializer<Block> BLOCK = new SerializerRegistryEntry<>(Registry.BLOCK);
-    public static final ISerializer<Item> ITEM = new SerializerRegistryEntry<>(Registry.ITEM);
-    public static final ISerializer<Enchantment> ENCHANTMENT = new SerializerRegistryEntry<>(Registry.ENCHANTMENT);
-    public static final ISerializer<Motive> MOTIVE = new SerializerRegistryEntry<>(Registry.MOTIVE);
-    public static final ISerializer<MobEffect> MOB_EFFECT = new SerializerRegistryEntry<>(Registry.MOB_EFFECT);
-    public static final ISerializer<Potion> POTION = new SerializerRegistryEntry<>(Registry.POTION);
-    public static final ISerializer<Attribute> ATTRIBUTE = new SerializerRegistryEntry<>(Registry.ATTRIBUTE);
-    public static final ISerializer<VillagerProfession> VILLAGER_PROFESSION = new SerializerRegistryEntry<>(Registry.VILLAGER_PROFESSION);
-    public static final ISerializer<VillagerType> VILLAGER_TYPE = new SerializerRegistryEntry<>(Registry.VILLAGER_TYPE);
-    public static final ISerializer<SoundEvent> SOUND_EVENT = new SerializerRegistryEntry<>(Registry.SOUND_EVENT);
-    public static final ISerializer<MenuType<?>> MENU = new SerializerRegistryEntry<>(Registry.MENU);
-    public static final ISerializer<ParticleType<?>> PARTICLE = new SerializerRegistryEntry<>(Registry.PARTICLE_TYPE);
-    public static final ISerializer<EntityType<?>> ENTITY = new SerializerRegistryEntry<>(Registry.ENTITY_TYPE);
-    public static final ISerializer<BlockEntityType<?>> BLOCK_ENTITY = new SerializerRegistryEntry<>(Registry.BLOCK_ENTITY_TYPE);
-    public static final ISerializer<GameEvent> GAME_EVENT = new SerializerRegistryEntry<>(Registry.GAME_EVENT);
+    public static final ISerializer<Block> BLOCK = new SerializerRegistryEntry<>(Services.REGISTRIES.blocks());
+    public static final ISerializer<Item> ITEM = new SerializerRegistryEntry<>(Services.REGISTRIES.items());
+    public static final ISerializer<Enchantment> ENCHANTMENT = new SerializerRegistryEntry<>(Services.REGISTRIES.enchantments());
+    public static final ISerializer<Motive> MOTIVE = new SerializerRegistryEntry<>(Services.REGISTRIES.paintings());
+    public static final ISerializer<MobEffect> MOB_EFFECT = new SerializerRegistryEntry<>(Services.REGISTRIES.mobEffects());
+    public static final ISerializer<Potion> POTION = new SerializerRegistryEntry<>(Services.REGISTRIES.potions());
+    public static final ISerializer<Attribute> ATTRIBUTE = new SerializerRegistryEntry<>(Services.REGISTRIES.attributes());
+    public static final ISerializer<VillagerProfession> VILLAGER_PROFESSION = new SerializerRegistryEntry<>(Services.REGISTRIES.villagerProfessions());
+    public static final ISerializer<VillagerType> VILLAGER_TYPE = new SerializerRegistryEntry<>(Services.REGISTRIES.villagerTypes());
+    public static final ISerializer<SoundEvent> SOUND_EVENT = new SerializerRegistryEntry<>(Services.REGISTRIES.sounds());
+    public static final ISerializer<MenuType<?>> MENU = new SerializerRegistryEntry<>(Services.REGISTRIES.menuTypes());
+    public static final ISerializer<ParticleType<?>> PARTICLE = new SerializerRegistryEntry<>(Services.REGISTRIES.particles());
+    public static final ISerializer<EntityType<?>> ENTITY = new SerializerRegistryEntry<>(Services.REGISTRIES.entities());
+    public static final ISerializer<BlockEntityType<?>> BLOCK_ENTITY = new SerializerRegistryEntry<>(Services.REGISTRIES.blockEntities());
+    public static final ISerializer<GameEvent> GAME_EVENT = new SerializerRegistryEntry<>(Services.REGISTRIES.gameEvents());
 }