getAnyExtensionTexture supports DDS files

Author: tdauth

core/src/com/etheller/warsmash/util/ImageUtils.java

@@ -11,6 +11,8 @@
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.imageio.ImageIO;
 
@@ -31,20 +33,38 @@ public final class ImageUtils {
 	public static final String DEFAULT_ICON_PATH = "ReplaceableTextures\\CommandButtons\\BTNTemp.blp";
 
 	public static Texture getAnyExtensionTexture(final DataSource dataSource, final String path) {
-		if (dataSource.has(path)) {
-			BufferedImage image;
-			try {
-				final AnyExtensionImage imageInfo = getAnyExtensionImageFixRGB(dataSource, path, "texture");
-				image = imageInfo.getImageData();
-				if (image != null) {
-					return ImageUtils.getTexture(image, imageInfo.isNeedsSRGBFix());
+		final List<String> paths = new LinkedList<>(List.of(path));
+
+		if (path.length() >= 4) {
+			final String extension = path.substring(path.length() - 4).toLowerCase();
+
+			if (!".dds".equals(extension)) {
+				// Reforged has TeamColors etc. as DDS files only.
+				paths.add(path.substring(0, path.length() - 4) + ".dds");
+			}
+
+			if (!".blp".equals(extension)) {
+				paths.add(path.substring(0, path.length() - 4) + ".blp");
+			}
+		}
+
+		for (String p : paths) {
+			if (dataSource.has(p)) {
+				BufferedImage image;
+				try {
+					final AnyExtensionImage imageInfo = getAnyExtensionImageFixRGB(dataSource, p, "texture");
+					image = imageInfo.getImageData();
+					if (image != null) {
+						return ImageUtils.getTexture(image, imageInfo.isNeedsSRGBFix());
+					}
+				} catch (final IOException e) {
+					return null;
 				}
-			} catch (final IOException e) {
-				return null;
 			}
-		} else {
-			System.err.println("Missing texture " + path);
 		}
+
+		System.err.println("Missing texture " + path + " tried paths: " + String.join(",", paths));
+
 		return null;
 	}