[1.19.3] Fix retrieveRegistryLookup attempting to get the registry lookup from a HolderGetter (#9225)

This commit is contained in:
matyrobbrt authored and GitHub committed 2022-12-19 16:03:56 +00:00
1 parent 84d7a0facb
commit d9e3a0081e
4 files changed
+45 -1

No files matched your search

@@ -11,3 +11,24 @@
private RegistrySetBuilder.BuildState m_254900_(RegistryAccess p_256400_) {
RegistrySetBuilder.BuildState registrysetbuilder$buildstate = RegistrySetBuilder.BuildState.m_255369_(p_256400_, this.f_254732_.stream().map(RegistrySetBuilder.RegistryStub::f_254738_));
this.f_254732_.forEach((p_255629_) -> {
@@ -81,7 +_,7 @@
RegistrySetBuilder.UniversalLookup registrysetbuilder$universallookup = new RegistrySetBuilder.UniversalLookup(registrysetbuilder$compositeowner);
ImmutableMap.Builder<ResourceLocation, HolderGetter<?>> builder = ImmutableMap.builder();
p_255995_.m_206193_().forEach((p_258197_) -> {
- builder.put(p_258197_.f_206233_().m_135782_(), RegistrySetBuilder.m_254882_(p_258197_.f_206234_().m_255303_()));
+ builder.put(p_258197_.f_206233_().m_135782_(), net.minecraftforge.common.ForgeHooks.wrapRegistryLookup(p_258197_.f_206234_().m_255303_()));
});
p_256495_.forEach((p_256603_) -> {
builder.put(p_256603_.m_135782_(), registrysetbuilder$universallookup);
@@ -102,6 +_,11 @@
public <S> HolderGetter<S> m_255420_(ResourceKey<? extends Registry<? extends S>> p_255961_) {
return (HolderGetter<S>) BuildState.this.f_254690_.getOrDefault(p_255961_.m_135782_(), BuildState.this.f_254749_);
+ }
+
+ @Override
+ public <S> Optional<HolderLookup.RegistryLookup<S>> registryLookup(ResourceKey<? extends Registry<? extends S>> registry) {
+ return Optional.ofNullable((HolderLookup.RegistryLookup<S>) BuildState.this.f_254690_.get(registry.m_135782_()));
}
};
}
@@ -0,0 +1,9 @@
--- a/net/minecraft/data/worldgen/BootstapContext.java
+++ b/net/minecraft/data/worldgen/BootstapContext.java
@@ -14,4 +_,6 @@
}
<S> HolderGetter<S> m_255420_(ResourceKey<? extends Registry<? extends S>> p_256410_);
+
+ default <S> java.util.Optional<net.minecraft.core.HolderLookup.RegistryLookup<S>> registryLookup(ResourceKey<? extends Registry<? extends S>> registry) { return java.util.Optional.empty(); }
}
@@ -10,7 +10,7 @@
+ return DataResult.error("Not a registry ops");
+
+ return registryOps.f_254668_.m_254838_(resourceKey).map(registryInfo -> {
+ if (!(registryInfo.f_254724_() instanceof HolderLookup.RegistryLookup<E> registryLookup))
+ if (!(registryInfo.f_254675_() instanceof HolderLookup.RegistryLookup<E> registryLookup))
+ return DataResult.<HolderLookup.RegistryLookup<E>>error("Found holder getter but was not a registry lookup for " + resourceKey);
+
+ return DataResult.success(registryLookup, registryInfo.f_254751_());
@@ -24,6 +24,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
@@ -46,6 +47,8 @@ import net.minecraft.commands.SharedSuggestionProvider;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderSet;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.ChatDecorator;
import net.minecraft.network.chat.ClickEvent;
@@ -1586,4 +1589,15 @@ public class ForgeHooks
}
return false;
}
@ApiStatus.Internal
public static <T> HolderLookup.RegistryLookup<T> wrapRegistryLookup(final HolderLookup.RegistryLookup<T> lookup)
{
return new HolderLookup.RegistryLookup.Delegate<>()
{
@Override protected RegistryLookup<T> parent() { return lookup; }
@Override public Stream<HolderSet.Named<T>> listTags() { return Stream.empty(); }
@Override public Optional<HolderSet.Named<T>> get(TagKey<T> key) { return Optional.of(HolderSet.emptyNamed(lookup, key)); }
};
}
}