Skip to content

Add Codecs to Registrar #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.20.6
Choose a base branch
from
+27 −0
Open

Add Codecs to Registrar #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions common/src/main/java/dev/architectury/registry/registries/Registrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package dev.architectury.registry.registries;

import com.mojang.serialization.Codec;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
Expand Down Expand Up @@ -77,6 +78,10 @@ default Holder<T> getHolder(ResourceLocation id) {
return getHolder(ResourceKey.create(key(), id));
}

Codec<T> codec();

Codec<Holder<T>> holderCodec();

/**
* Listens to when the registry entry is registered, and calls the given action.
* Evaluates immediately if the entry is already registered.
Expand Down
11 changes: 11 additions & 0 deletions fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.common.base.Suppliers;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.mojang.serialization.Codec;
import dev.architectury.impl.RegistrySupplierImpl;
import dev.architectury.registry.registries.Registrar;
import dev.architectury.registry.registries.RegistrarBuilder;
Expand Down Expand Up @@ -289,6 +290,16 @@ public Holder<T> getHolder(ResourceKey<T> key) {
return delegate.getHolder(key).orElse(null);
}

@Override
public Codec<T> codec() {
return delegate.byNameCodec();
}

@Override
public Codec<Holder<T>> holderCodec() {
return delegate.holderByNameCodec();
}

@Override
public Iterator<T> iterator() {
return delegate.iterator();
Expand Down
11 changes: 11 additions & 0 deletions neoforge/src/main/java/dev/architectury/registry/registries/forge/RegistrarManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.common.base.Suppliers;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.mojang.serialization.Codec;
import dev.architectury.impl.RegistrySupplierImpl;
import dev.architectury.platform.hooks.EventBusesHooks;
import dev.architectury.registry.registries.Registrar;
Expand Down Expand Up @@ -397,6 +398,16 @@ public Holder<T> getHolder(ResourceKey<T> key) {
return delegate.getHolder(key).orElse(null);
}

@Override
public Codec<T> codec() {
return delegate.byNameCodec();
}

@Override
public Codec<Holder<T>> holderCodec() {
return delegate.holderByNameCodec();
}

@Override
public Iterator<T> iterator() {
return delegate.iterator();
Expand Down