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

Merge remote-tracking branch 'origin/1.16' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-12-18 22:06:24 -05:00
commit af13e30f95
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ import java.util.*;
*/ */
public class ModelBakeEventHelper { public class ModelBakeEventHelper {
// TODO: make into config option // TODO: make into config option
private static final Set<String> INCOMPATIBLE_MODS = ImmutableSet.of("industrialforegoing", "vampirism"); private static final Set<String> INCOMPATIBLE_MODS = ImmutableSet.of("industrialforegoing", "vampirism", "elevatorid");
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;

7
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java
View File

@ -63,11 +63,15 @@ public abstract class CTMPackReloadListenerMixin implements ModernFixClientInteg
if(original == null) if(original == null)
original = DEFAULT_PREDICATE; original = DEFAULT_PREDICATE;
blockRenderChecks.put(block.delegate, original); blockRenderChecks.put(block.delegate, original);
ItemBlockRenderTypes.setRenderLayer(block, type -> this.useOverrideIfPresent(block.delegate, type)); updateBlockPredicate(block);
} }
} }
} }
private void updateBlockPredicate(Block block) {
ItemBlockRenderTypes.setRenderLayer(block, type -> this.useOverrideIfPresent(block.delegate, type));
}
private boolean useOverrideIfPresent(IRegistryDelegate<Block> delegate, RenderType type) { private boolean useOverrideIfPresent(IRegistryDelegate<Block> delegate, RenderType type) {
Predicate<RenderType> override = renderCheckOverrides.get(delegate); Predicate<RenderType> override = renderCheckOverrides.get(delegate);
if(override == null) if(override == null)
@ -97,6 +101,7 @@ public abstract class CTMPackReloadListenerMixin implements ModernFixClientInteg
Predicate<RenderType> newPredicate = this.getLayerCheck(state, originalModel); Predicate<RenderType> newPredicate = this.getLayerCheck(state, originalModel);
if(newPredicate != null) { if(newPredicate != null) {
renderCheckOverrides.put(block.delegate, newPredicate); renderCheckOverrides.put(block.delegate, newPredicate);
updateBlockPredicate(block);
return originalModel; return originalModel;
} }
} }

2
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java
View File

@ -42,7 +42,7 @@ public abstract class TextureMetadataHandlerMixin implements ModernFixClientInte
@Override @Override
public BakedModel onBakedModelLoad(ResourceLocation rl, UnbakedModel rootModel, BakedModel baked, ModelState state, ModelBakery bakery) { public BakedModel onBakedModelLoad(ResourceLocation rl, UnbakedModel rootModel, BakedModel baked, ModelState state, ModelBakery bakery) {
if (!(baked instanceof AbstractCTMBakedModel) && !baked.isCustomRenderer()) { if (rl instanceof ModelResourceLocation && !(baked instanceof AbstractCTMBakedModel) && !baked.isCustomRenderer()) {
Deque<ResourceLocation> dependencies = new ArrayDeque<>(); Deque<ResourceLocation> dependencies = new ArrayDeque<>();
Set<ResourceLocation> seenModels = new HashSet<>(); Set<ResourceLocation> seenModels = new HashSet<>();
dependencies.push(rl); dependencies.push(rl);