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

Author: embeddedt

forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java

@@ -28,7 +28,7 @@
  */
 public class ModelBakeEventHelper {
     // 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 Set<ResourceLocation> topLevelModelLocations;
     private final MutableGraph<String> dependencyGraph;

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

@@ -63,11 +63,15 @@ private void refreshLayerHacks() {
                 if(original == null)
                     original = DEFAULT_PREDICATE;
                 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) {
         Predicate<RenderType> override = renderCheckOverrides.get(delegate);
         if(override == null)
@@ -97,6 +101,7 @@ public BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseM
             Predicate<RenderType> newPredicate = this.getLayerCheck(state, originalModel);
             if(newPredicate != null) {
                 renderCheckOverrides.put(block.delegate, newPredicate);
+                updateBlockPredicate(block);
                 return originalModel;
             }
         }

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

@@ -42,7 +42,7 @@ private void noIteration(CallbackInfo ci) {
 
     @Override
     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<>();
             Set<ResourceLocation> seenModels = new HashSet<>();
             dependencies.push(rl);