mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Fix missed vanilla method overrides in ForgeRegistry (#8766)
This commit is contained in:
1 parent
22668ad2c2
commit
17565c0ea2
4 files changed
+42
-7
No files matched your search
@@ -307,6 +307,12 @@ public class ForgeRegistry<V> implements IForgeRegistryInternal<V>, IForgeRegist
|
||||
return Collections.unmodifiableSet(this.names.keySet());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
Set<ResourceKey<V>> getResourceKeys()
|
||||
{
|
||||
return Collections.unmodifiableSet(this.keys.keySet());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public Collection<V> getValues()
|
||||
|
||||
@@ -166,6 +166,12 @@ class NamespacedDefaultedWrapper<T> extends DefaultedRegistry<T> implements ILoc
|
||||
return this.delegate.getKeys();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<ResourceKey<T>> registryKeySet()
|
||||
{
|
||||
return this.delegate.getResourceKeys();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Map.Entry<ResourceKey<T>, T>> entrySet()
|
||||
{
|
||||
@@ -192,7 +198,8 @@ class NamespacedDefaultedWrapper<T> extends DefaultedRegistry<T> implements ILoc
|
||||
|
||||
@Override public Optional<Holder<T>> getHolder(int id) { return this.holders.getHolder(id); }
|
||||
@Override public Optional<Holder<T>> getHolder(ResourceKey<T> key) { return this.holders.getHolder(key); }
|
||||
@Override public DataResult<Holder<T>> getOrCreateHolder(ResourceKey<T> key) { return DataResult.success(this.holders.getOrCreateHolder(key)); }
|
||||
@Override public DataResult<Holder<T>> getOrCreateHolder(ResourceKey<T> key) { return this.holders.getOrCreateHolder(key); }
|
||||
@Override public Holder<T> getOrCreateHolderOrThrow(ResourceKey<T> key) { return this.holders.getOrCreateHolderOrThrow(key); }
|
||||
@Override public Optional<Holder<T>> getRandom(RandomSource rand) { return this.holders.getRandom(rand); }
|
||||
@Override public Stream<Holder.Reference<T>> holders() { return this.holders.holders(); }
|
||||
@Override public boolean isKnownTagName(TagKey<T> name) { return this.holders.isKnownTagName(name); }
|
||||
|
||||
@@ -22,6 +22,8 @@ import java.util.stream.Stream;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
import com.google.common.collect.Multimaps;
|
||||
import com.mojang.serialization.DataResult;
|
||||
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -88,15 +90,28 @@ class NamespacedHolderHelper<T>
|
||||
return Optional.ofNullable(this.holders.get(value));
|
||||
}
|
||||
|
||||
Holder<T> getOrCreateHolder(ResourceKey<T> key)
|
||||
DataResult<Holder<T>> getOrCreateHolder(ResourceKey<T> key)
|
||||
{
|
||||
return this.holdersByName.computeIfAbsent(key.location(), k ->
|
||||
Holder.Reference<T> ref = this.holdersByName.get(key.location());
|
||||
if (ref == null)
|
||||
{
|
||||
if (this.holderLookup != null)
|
||||
throw new IllegalStateException("This registry can't create new holders without value");
|
||||
return DataResult.error("This registry can't create new holders without value (requested key: " + key + ")");
|
||||
|
||||
if (this.frozen)
|
||||
throw new IllegalStateException("Registry is already frozen (trying to add key " + k + ")");
|
||||
return Holder.Reference.createStandAlone(this.self, key);
|
||||
return DataResult.error("Registry is already frozen (trying to add key " + key + ")");
|
||||
|
||||
ref = Holder.Reference.createStandAlone(this.self, key);
|
||||
this.holdersByName.put(key.location(), ref);
|
||||
}
|
||||
return DataResult.success(ref);
|
||||
}
|
||||
|
||||
Holder<T> getOrCreateHolderOrThrow(ResourceKey<T> key)
|
||||
{
|
||||
return getOrCreateHolder(key).getOrThrow(false, msg ->
|
||||
{
|
||||
throw new IllegalStateException(msg);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -164,6 +164,12 @@ class NamespacedWrapper<T> extends MappedRegistry<T> implements ILockableRegistr
|
||||
return this.delegate.getKeys();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<ResourceKey<T>> registryKeySet()
|
||||
{
|
||||
return this.delegate.getResourceKeys();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Map.Entry<ResourceKey<T>, T>> entrySet()
|
||||
{
|
||||
@@ -190,7 +196,8 @@ class NamespacedWrapper<T> extends MappedRegistry<T> implements ILockableRegistr
|
||||
|
||||
@Override public Optional<Holder<T>> getHolder(int id) { return this.holders.getHolder(id); }
|
||||
@Override public Optional<Holder<T>> getHolder(ResourceKey<T> key) { return this.holders.getHolder(key); }
|
||||
@Override public DataResult<Holder<T>> getOrCreateHolder(ResourceKey<T> key) { return DataResult.success(this.holders.getOrCreateHolder(key)); }
|
||||
@Override public DataResult<Holder<T>> getOrCreateHolder(ResourceKey<T> key) { return this.holders.getOrCreateHolder(key); }
|
||||
@Override public Holder<T> getOrCreateHolderOrThrow(ResourceKey<T> key) { return this.holders.getOrCreateHolderOrThrow(key); }
|
||||
@Override public Optional<Holder<T>> getRandom(RandomSource rand) { return this.holders.getRandom(rand); }
|
||||
@Override public Stream<Holder.Reference<T>> holders() { return this.holders.holders(); }
|
||||
@Override public boolean isKnownTagName(TagKey<T> name) { return this.holders.isKnownTagName(name); }
|
||||
|
||||
Reference in new issue
Block a user