external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2655 from kevlahnota/newmaster2

Browse Source 
fix old themes without hdbuttons and hdstart
This commit is contained in:
Anthony Calosa
2023-03-11 05:45:35 +08:00
committed by GitHub
parent 1f12b0dee8 2d4ec54562
commit c9602147b9
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-gui-mobile/src/forge/assets/FSkin.java
View File

@@ -316,9 +316,13 @@ public class FSkin {
Forge.hdbuttons = true; Forge.hdbuttons = true;
} }
} else if (f11b.exists() && Forge.allowCardBG) { } else if (f11b.exists() && Forge.allowCardBG) {
manager.load(f11b.path(), Texture.class, Forge.getAssets().getTextureFilter()); if (FSkin.preferredName.isEmpty() || FSkin.preferredName.equalsIgnoreCase("default")) {
manager.finishLoadingAsset(f11b.path()); manager.load(f11b.path(), Texture.class, Forge.getAssets().getTextureFilter());
Forge.hdbuttons = true; manager.finishLoadingAsset(f11b.path());
Forge.hdbuttons = true;
} else {
Forge.hdbuttons = false;
}
} else { Forge.hdbuttons = false; } //how to refresh buttons when a theme don't have hd buttons? } else { Forge.hdbuttons = false; } //how to refresh buttons when a theme don't have hd buttons?
if (f12.exists()) { if (f12.exists()) {
if (!Forge.allowCardBG) { if (!Forge.allowCardBG) {
@@ -329,9 +333,13 @@ public class FSkin {
Forge.hdstart = true; Forge.hdstart = true;
} }
} else if (f12b.exists() && Forge.allowCardBG) { } else if (f12b.exists() && Forge.allowCardBG) {
manager.load(f12b.path(), Texture.class, Forge.getAssets().getTextureFilter()); if (FSkin.preferredName.isEmpty() || FSkin.preferredName.equalsIgnoreCase("default")) {
manager.finishLoadingAsset(f12b.path()); manager.load(f12b.path(), Texture.class, Forge.getAssets().getTextureFilter());
Forge.hdstart = true; manager.finishLoadingAsset(f12b.path());
Forge.hdstart = true;
} else {
Forge.hdstart = false;
}
} else { Forge.hdstart = false; } } else { Forge.hdstart = false; }
//update colors //update colors
for (final FSkinColor.Colors c : FSkinColor.Colors.values()) { for (final FSkinColor.Colors c : FSkinColor.Colors.values()) {