Merge branch 'kevlahnota-master-patch-39000' into 'master'

Update ImageKeys.java

See merge request core-developers/forge!5237
This commit is contained in:
Anthony Calosa
2021-08-19 12:34:23 +00:00

View File

@@ -132,6 +132,7 @@ public final class ImageKeys {
//setlookup //setlookup
if (!StaticData.instance().getSetLookup().isEmpty()) { if (!StaticData.instance().getSetLookup().isEmpty()) {
for (String setKey : StaticData.instance().getSetLookup().keySet()) { for (String setKey : StaticData.instance().getSetLookup().keySet()) {
if (filename.startsWith(setKey)) {
for (String setLookup : StaticData.instance().getSetLookup().get(setKey)) { for (String setLookup : StaticData.instance().getSetLookup().get(setKey)) {
//.fullborder lookup //.fullborder lookup
file = findFile(dir, TextUtil.fastReplace(fullborderFile, setKey, getSetFolder(setLookup))); file = findFile(dir, TextUtil.fastReplace(fullborderFile, setKey, getSetFolder(setLookup)));
@@ -147,6 +148,7 @@ public final class ImageKeys {
} }
} }
} }
}
//if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder
if (!filename.contains(".full")) { if (!filename.contains(".full")) {
file = findFile(dir, TextUtil.addSuffix(filename,".full")); file = findFile(dir, TextUtil.addSuffix(filename,".full"));