imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-04-02 21:47:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 20.2.59-beta & Adapt to Registry Changes

Browse Source
This commit is contained in:
shedaniel
2023-11-20 21:00:36 +08:00
parent 426ca41331
commit 9aba3cf1dc
13 changed files with 755 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java
View File

@@ -23,6 +23,7 @@ import com.google.common.base.Objects;
import com.google.common.base.Suppliers;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import dev.architectury.impl.RegistrySupplierImpl;
import dev.architectury.registry.registries.Registrar;
import dev.architectury.registry.registries.RegistrarBuilder;
import dev.architectury.registry.registries.RegistrarManager;
@@ -32,6 +33,7 @@ import dev.architectury.registry.registries.options.StandardRegistrarOption;
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
import net.minecraft.core.Holder;
import net.minecraft.core.MappedRegistry;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
@@ -153,7 +155,17 @@ public class RegistrarManagerImpl {
public RegistrySupplier<T> delegate(ResourceLocation id) {
Supplier<T> value = Suppliers.memoize(() -> get(id));
RegistrarImpl<T> registrar = this;
return new RegistrySupplier<>() {
return new RegistrySupplierImpl<T>() {
@Nullable
Holder<T> holder = null;
@Nullable
@Override
public Holder<T> getHolder() {
if (holder != null) return holder;
return holder = registrar.getHolder(getId());
}
@Override
public RegistrarManager getRegistrarManager() {
return RegistrarManager.get(modId);
@@ -259,6 +271,12 @@ public class RegistrarManagerImpl {
return delegate.key();
}
@Override
@Nullable
public Holder<T> getHolder(ResourceKey<T> key) {
return delegate.getHolder(key).orElse(null);
}
@Override
public Iterator<T> iterator() {
return delegate.iterator();