Merge 1.18 into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/resources/CachedResourcePath.java

@@ -14,7 +14,7 @@ public class CachedResourcePath {
 
     public static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner();
     private static final Splitter SLASH_SPLITTER = Splitter.on('/');
-    private static final String[] NO_PREFIX = new String[0];
+    public static final String[] NO_PREFIX = new String[0];
 
     public CachedResourcePath(String[] prefix, Path path) {
         this(prefix, path, path.getNameCount(), true);

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -447,7 +447,7 @@ public void getOrLoadModelDynamic(ResourceLocation modelLocation, CallbackInfoRe
 
     @Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;"))
     private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) {
-        if(this.inTextureGatheringPass)
+        if(this.inTextureGatheringPass || !(location instanceof ModelResourceLocation))
             return stateDefinition.getPossibleStates();
         else
             return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location);

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

@@ -312,7 +312,9 @@ private <T extends Comparable<T>, V extends T> BlockState setPropertyGeneric(Blo
     }
     @Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;"))
     private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) {
-       return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location);
+        if(!(location instanceof ModelResourceLocation))
+            return stateDefinition.getPossibleStates();
+        return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location);
     }
 
     @Override