what about this

MehVahdJukaar · Dec 16, 2024 · b905ad2 · b905ad2
1 parent e001b0f
commit b905ad2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/common/src/main/java/net/mehvahdjukaar/moonlight/api/resources/BlockTypeResTransformer.java b/common/src/main/java/net/mehvahdjukaar/moonlight/api/resources/BlockTypeResTransformer.java
@@ -260,18 +260,18 @@ public static String replaceFullGenericType(String text, BlockType blockType, Re
 
         //pattern to find sub folders. Does not include "/"
         //matches stuff between oldNamespace + folderName and oldTypeName not including leading or trailing slashes
-        Pattern subFolderPattern = Pattern.compile(oldNamespace + folderReg + "\\/?(.*?\\/?.*?)" + oldTypeName);
+        Pattern subFolderPattern = Pattern.compile(oldNamespace + folderReg + "\\/?(.*?)\\/?(.*?)" + oldTypeName);
         Matcher subFolderMatcher = subFolderPattern.matcher(text);
         return subFolderMatcher.replaceAll(m ->
-                newNamespace + joinWithSeparator(m.group(1), blockPathPrefix, m.group(2), blockPathSuffix)
+                newNamespace + joinWithSeparator(m.group(1), blockPathPrefix, m.group(2), m.group(3) + blockPathSuffix)
         );
     }
 
     private static String joinWithSeparator(String... strings) {
         StringBuilder sb = new StringBuilder();
         for (String s : strings) {
             if (!s.isEmpty()) {
-                if (!sb.isEmpty() && s.endsWith("/")) sb.append("/");
+                if (!sb.isEmpty()) sb.append("/");
                 sb.append(s);
             }
         }