R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit registry wrapping to known bad mods to avoid performance issues

Browse Source
This commit is contained in:
embeddedt 2023-07-06 22:03:08 -04:00
parent 45ada33d7d
commit 8f896f065c
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java
View File

@ -1,6 +1,7 @@
package org.embeddedt.modernfix.forge.dynresources; package org.embeddedt.modernfix.forge.dynresources;
import com.google.common.collect.ForwardingMap; import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.graph.GraphBuilder; import com.google.common.graph.GraphBuilder;
import com.google.common.graph.MutableGraph; import com.google.common.graph.MutableGraph;
@ -26,6 +27,8 @@ import java.util.Set;
* of the model registry that emulates vanilla keySet behavior. * of the model registry that emulates vanilla keySet behavior.
*/ */
public class ModelBakeEventHelper { public class ModelBakeEventHelper {
// TODO: make into config option
private static final Set<String> INCOMPATIBLE_MODS = ImmutableSet.of("industrialforegoing");
private final Map<ResourceLocation, BakedModel> modelRegistry; private final Map<ResourceLocation, BakedModel> modelRegistry;
private final Set<ResourceLocation> topLevelModelLocations; private final Set<ResourceLocation> topLevelModelLocations;
private final MutableGraph<String> dependencyGraph; private final MutableGraph<String> dependencyGraph;
@ -43,6 +46,9 @@ public class ModelBakeEventHelper {
this.dependencyGraph = GraphBuilder.undirected().build(); this.dependencyGraph = GraphBuilder.undirected().build();
ModList.get().forEachModContainer((id, mc) -> { ModList.get().forEachModContainer((id, mc) -> {
this.dependencyGraph.addNode(id); this.dependencyGraph.addNode(id);
for(IModInfo.ModVersion version : mc.getModInfo().getDependencies()) {
this.dependencyGraph.addNode(version.getModId());
}
}); });
for(String id : this.dependencyGraph.nodes()) { for(String id : this.dependencyGraph.nodes()) {
Optional<? extends ModContainer> mContainer = ModList.get().getModContainerById(id); Optional<? extends ModContainer> mContainer = ModList.get().getModContainerById(id);
@ -61,6 +67,8 @@ public class ModelBakeEventHelper {
modIdsToInclude.addAll(this.dependencyGraph.adjacentNodes(modId)); modIdsToInclude.addAll(this.dependencyGraph.adjacentNodes(modId));
} catch(IllegalArgumentException ignored) { /* sanity check */ } } catch(IllegalArgumentException ignored) { /* sanity check */ }
modIdsToInclude.remove("minecraft"); modIdsToInclude.remove("minecraft");
if(modIdsToInclude.stream().noneMatch(INCOMPATIBLE_MODS::contains))
return this.modelRegistry;
Set<ResourceLocation> ourModelLocations = Sets.filter(this.topLevelModelLocations, loc -> modIdsToInclude.contains(loc.getNamespace())); Set<ResourceLocation> ourModelLocations = Sets.filter(this.topLevelModelLocations, loc -> modIdsToInclude.contains(loc.getNamespace()));
return new ForwardingMap<ResourceLocation, BakedModel>() { return new ForwardingMap<ResourceLocation, BakedModel>() {
@Override @Override