mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
[1.21.1] ModLoading cleanup and optimisations (#10052)
This commit is contained in:
1 parent
f106ff0c21
commit
9714512c31
101 files changed
+837
-841
No files matched your search
@@ -53,10 +53,10 @@ class NamespacedWrapper<T> extends MappedRegistry<T> implements ILockableRegistr
|
||||
Lifecycle registryLifecycle = Lifecycle.stable();
|
||||
private boolean frozen = false; // Frozen is vanilla's variant of locked, but it can be unfrozen
|
||||
private List<Holder.Reference<T>> holdersSorted;
|
||||
private ObjectList<Holder.Reference<T>> holdersById = new ObjectArrayList<>(256);
|
||||
private Map<ResourceLocation, Holder.Reference<T>> holdersByName = new HashMap<>();
|
||||
private Map<T, Holder.Reference<T>> holders = new IdentityHashMap<>();
|
||||
private RegistryManager stage;
|
||||
private final ObjectList<Holder.Reference<T>> holdersById = new ObjectArrayList<>(256);
|
||||
private final Map<ResourceLocation, Holder.Reference<T>> holdersByName = new HashMap<>();
|
||||
private final Map<T, Holder.Reference<T>> holders = new IdentityHashMap<>();
|
||||
private final RegistryManager stage;
|
||||
private volatile Map<TagKey<T>, HolderSet.Named<T>> tags = new IdentityHashMap<>();
|
||||
private final Map<ResourceKey<T>, RegistrationInfo> registrationInfos = new IdentityHashMap<>();
|
||||
|
||||
@@ -323,7 +323,9 @@ class NamespacedWrapper<T> extends MappedRegistry<T> implements ILockableRegistr
|
||||
@Override
|
||||
public void bindTags(Map<TagKey<T>, List<Holder<T>>> newTags) {
|
||||
Map<Holder.Reference<T>, List<TagKey<T>>> holderToTag = new IdentityHashMap<>();
|
||||
this.holdersByName.values().forEach(v -> holderToTag.put(v, new ArrayList<>()));
|
||||
for (Holder.Reference<T> tReference : this.holdersByName.values()) {
|
||||
holderToTag.put(tReference, new ArrayList<>());
|
||||
}
|
||||
newTags.forEach((name, values) -> values.forEach(holder -> addTagToHolder(holderToTag, name, holder)));
|
||||
|
||||
Set<TagKey<T>> set = new HashSet<>(Sets.difference(this.tags.keySet(), newTags.keySet()));
|
||||
@@ -336,15 +338,17 @@ class NamespacedWrapper<T> extends MappedRegistry<T> implements ILockableRegistr
|
||||
newTags.forEach((k, v) -> tmpTags.computeIfAbsent(k, this::createTag).bind(v));
|
||||
|
||||
Set<TagKey<T>> defaultedTags = Sets.difference(this.optionalTags.keySet(), newTags.keySet());
|
||||
defaultedTags.forEach(name -> {
|
||||
for (TagKey<T> name : defaultedTags) {
|
||||
List<Holder<T>> defaults = this.optionalTags.get(name).stream()
|
||||
.map(valueSupplier -> getHolder(valueSupplier.get()).orElse(null))
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.toList();
|
||||
defaults.forEach(holder -> addTagToHolder(holderToTag, name, holder));
|
||||
for (Holder<T> holder : defaults) {
|
||||
addTagToHolder(holderToTag, name, holder);
|
||||
}
|
||||
tmpTags.computeIfAbsent(name, this::createTag).bind(defaults);
|
||||
});
|
||||
}
|
||||
|
||||
holderToTag.forEach(Holder.Reference::bindTags);
|
||||
this.tags = tmpTags;
|
||||
|
||||
Reference in new issue
Block a user