Strip the directory name from mod contents, without assuming that the…

… directory name exactly matches the mod name. (demodude4u#43)

Co-authored-by: Bilka <[email protected]>

FactorioDataWrapper/src/com/demod/factorio/ModLoader.java

@@ -16,9 +16,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
 
 import org.json.JSONException;
 
@@ -58,18 +56,16 @@ public Optional<InputStream> getResource(String path) throws FileNotFoundExcepti
 			}
 		}
 	}
-
 	public static class ModZip implements Mod {
 		private final Map<String, byte[]> files = new LinkedHashMap<>();
 		private ModInfo info;
 
 		private volatile Optional<String> lastResourceFolder = Optional.empty();
 
 		public ModZip(File file) throws FileNotFoundException, IOException {
-			String prefix = file.getName().substring(0, file.getName().length() - 4);
 			try (ZipFile zipFile = new ZipFile(file)) {
 				zipFile.stream().forEach(entry -> {
-					String name = entry.getName().replace(prefix, "");
+					String name = stripDirectoryName(entry.getName());
 
 					try (InputStream inputStream = zipFile.getInputStream(entry)) {
 						files.put(name, ByteStreams.toByteArray(inputStream));
@@ -89,6 +85,14 @@ public ModZip(File file) throws FileNotFoundException, IOException {
 			}
 		}
 
+		private static String stripDirectoryName(String name) {
+			int firstSlash = name.indexOf('/');
+			if (firstSlash == -1) {
+				return name;
+			}
+			return name.substring(firstSlash);
+		}
+
 		@Override
 		public ModInfo getInfo() {
 			return info;