imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 11:57:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow only using getRegistryName

Browse Source
This commit is contained in:
shedaniel
2020-11-07 18:24:16 +08:00
parent 0eec3e7108
commit 87b5dcf7d9
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/me/shedaniel/architectury/registry/Registries.java
View File

@@ -53,7 +53,7 @@ public final class Registries {
* Fabric: Use registry
*/
@Nullable
public static <T> ResourceLocation getId(T object, ResourceKey<net.minecraft.core.Registry<T>> fallback) {
public static <T> ResourceLocation getId(T object, @Nullable ResourceKey<net.minecraft.core.Registry<T>> fallback) {
return IMPL.getId(object, fallback);
}
@@ -63,10 +63,20 @@ public final class Registries {
*/
@Nullable
@Deprecated
public static <T> ResourceLocation getId(T object, net.minecraft.core.Registry<T> fallback) {
public static <T> ResourceLocation getId(T object, @Nullable net.minecraft.core.Registry<T> fallback) {
return IMPL.getId(object, fallback);
}
/**
* Forge: If the object is {@code IForgeRegistryEntry}, use `getRegistryName`, else null
* Fabric: null
*/
@Deprecated
@Nullable
public static <T> ResourceLocation getRegistryName(T object) {
return IMPL.getId(object, (ResourceKey<net.minecraft.core.Registry<T>>) null);
}
public interface Impl {
RegistryProvider get(String modId);

20
fabric/src/main/java/me/shedaniel/architectury/registry/fabric/RegistriesImpl.java
View File

@@ -38,11 +38,15 @@ public class RegistriesImpl implements Registries.Impl {
@Override
public <T> ResourceLocation getId(T object, ResourceKey<net.minecraft.core.Registry<T>> fallback) {
if (fallback == null)
return null;
return RegistryProviderImpl.INSTANCE.get(fallback).getId(object);
}
@Override
public <T> ResourceLocation getId(T object, net.minecraft.core.Registry<T> fallback) {
if (fallback == null)
return null;
return RegistryProviderImpl.INSTANCE.get(fallback).getId(object);
}
@@ -83,42 +87,42 @@ public class RegistriesImpl implements Registries.Impl {
public @Nullable ResourceLocation getId(T obj) {
return delegate.getKey(obj);
}
@Override
public Optional<ResourceKey<T>> getKey(T obj) {
return delegate.getResourceKey(obj);
}
@Override
public @Nullable T get(ResourceLocation id) {
return delegate.get(id);
}
@Override
public boolean contains(ResourceLocation id) {
return delegate.containsKey(id);
}
@Override
public boolean containsValue(T obj) {
return delegate.getResourceKey(obj).isPresent();
}
@Override
public Set<ResourceLocation> getIds() {
return delegate.keySet();
}
@Override
public Set<Map.Entry<ResourceKey<T>, T>> entrySet() {
return delegate.entrySet();
}
@Override
public ResourceKey<? extends net.minecraft.core.Registry<T>> key() {
return delegate.key();
}
@NotNull
@Override
public Iterator<T> iterator() {