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

src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -66,14 +66,17 @@ public class ModernFixEarlyConfig {
         disableIfModPresent("mixin.perf.async_jei", "modernui");
         disableIfModPresent("mixin.perf.compress_biome_container", "chocolate", "betterendforge");
         disableIfModPresent("mixin.bugfix.mc218112", "performant");
-        disableIfModPresent("mixin.perf.faster_baking", "touhou_little_maid");
         disableIfModPresent("mixin.perf.reuse_datapacks", "tac");
     }
 
     private void disableIfModPresent(String configName, String... ids) {
         for(String id : ids) {
             if(FMLLoader.getLoadingModList().getModFileById(id) != null) {
-                this.options.get(configName).addModOverride(false, id);
+                Option option = this.options.get(configName);
+                if(option != null)
+                    option.addModOverride(false, id);
+                else
+                    LOGGER.warn("Can't disable missing option {}", configName);
             }
         }
     }

src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/PathResourcePackMixin.java

@@ -70,10 +70,11 @@ public abstract class PathResourcePackMixin {
                                     .map(path -> root.relativize(path.toAbsolutePath()))
                                     .filter(this::isValidCachedResourcePath)
                                     .forEach(path -> {
-                                        if(!path.toString().endsWith(".mcmeta"))
+                                        CachedResourcePath listing = new CachedResourcePath(path);
-                                            rootListingPaths.add(new CachedResourcePath(path));
+                                        if(!listing.getFileName().endsWith(".mcmeta")) {
-                                        String mergedPath = slashJoiner.join(type.getDirectory(), namespace, path);
+                                            rootListingPaths.add(listing);
-                                        containedPaths.add(new CachedResourcePath(mergedPath));
+                                        }
+                                        this.containedPaths.add(new CachedResourcePath(new String[] { type.getDirectory(), namespace }, listing));
                                     });
                             rootListingPaths.trimToSize();
                             rootListingForNamespaces.put(namespace, rootListingPaths);

src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java

@@ -9,32 +9,58 @@ import com.google.common.collect.Streams;
 
 import java.lang.ref.WeakReference;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class CachedResourcePath {
-    private final ImmutableList<String> pathComponents;
+    private final String[] pathComponents;
     private int hashCode = 0;
 
     private static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner();
     private static final Splitter SLASH_SPLITTER = Splitter.on('/');
     private static final Joiner SLASH_JOINER = Joiner.on('/');
     private WeakReference<String> fullPathCache = new WeakReference<>(null);
-
+    private static final String[] NO_PREFIX = new String[0];
-    public CachedResourcePath(Iterable<String> components) {
-        ImmutableList.Builder<String> b = ImmutableList.builder();
-        for(String s : components) {
-            if(s == null || s.length() == 0)
-                continue;
-            b.add(PATH_COMPONENT_INTERNER.intern(s));
-        }
-        pathComponents = b.build();
-    }
 
     public CachedResourcePath(Path path) {
-        this(() -> Streams.stream(path.iterator()).map(Path::toString).iterator());
+        this(NO_PREFIX, path, path.getNameCount());
     }
 
     public CachedResourcePath(String s) {
-        this(SLASH_SPLITTER.split(s));
+        this(NO_PREFIX, SLASH_SPLITTER.splitToList(s));
+    }
+
+    public <T> CachedResourcePath(String[] prefixElements, Collection<T> collection) {
+        this(prefixElements, collection, collection.size());
+    }
+
+    public <T> CachedResourcePath(String[] prefixElements, Iterable<T> path, int count) {
+        String[] components = new String[prefixElements.length + count];
+        int i = 0;
+        while(i < prefixElements.length) {
+            components[i] = PATH_COMPONENT_INTERNER.intern(prefixElements[i]);
+            i++;
+        }
+        for(Object component : path) {
+            String s = component.toString();
+            if(s.length() == 0)
+                continue;
+            components[i] = PATH_COMPONENT_INTERNER.intern(s);
+        }
+        pathComponents = components;
+    }
+
+    public CachedResourcePath(String[] prefixElements, CachedResourcePath other) {
+        String[] components = new String[prefixElements.length + other.pathComponents.length];
+        int i = 0;
+        while(i < prefixElements.length) {
+            components[i] = PATH_COMPONENT_INTERNER.intern(prefixElements[i]);
+            i++;
+        }
+        System.arraycopy(other.pathComponents, 0, components, i, other.pathComponents.length);
+        pathComponents = components;
     }
 
     @Override
@@ -42,7 +68,7 @@ public class CachedResourcePath {
         int result = hashCode;
         if(result != 0)
             return result;
-        hashCode = pathComponents.hashCode();
+        hashCode = Arrays.hashCode(pathComponents);
         return hashCode;
     }
 
@@ -51,15 +77,15 @@ public class CachedResourcePath {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         CachedResourcePath that = (CachedResourcePath) o;
-        return pathComponents.equals(that.pathComponents);
+        return Arrays.equals(pathComponents, that.pathComponents);
     }
 
     public String getFileName() {
-        return pathComponents.get(pathComponents.size() - 1);
+        return pathComponents[pathComponents.length - 1];
     }
 
     public int getNameCount() {
-        return pathComponents.size();
+        return pathComponents.length;
     }
 
     public String getFullPath() {