mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
Refactor ForgeConstants to work with android also.
This commit is contained in:
@@ -20,7 +20,6 @@ import javax.swing.MenuElement;
|
||||
import javax.swing.MenuSelectionManager;
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
@@ -122,12 +121,6 @@ public class GuiDesktop implements IGuiBase {
|
||||
return SwingUtilities.isEventDispatchThread();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAssetsDir() {
|
||||
return StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "svn") ?
|
||||
"../forge-gui/" : "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public ISkinImage getSkinIcon(FSkinProp skinProp) {
|
||||
if (skinProp == null) { return null; }
|
||||
|
||||
@@ -17,11 +17,15 @@
|
||||
*/
|
||||
package forge.view;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import forge.GuiBase;
|
||||
import forge.GuiDesktop;
|
||||
import forge.Singletons;
|
||||
import forge.card.CardReaderExperiments;
|
||||
import forge.error.ExceptionHandler;
|
||||
import forge.properties.ForgeConstants;
|
||||
import forge.util.BuildInfo;
|
||||
|
||||
/**
|
||||
* Main class for Forge's swing application view.
|
||||
@@ -31,6 +35,10 @@ public final class Main {
|
||||
* Main entrypoint for Forge
|
||||
*/
|
||||
public static void main(final String[] args) {
|
||||
// Init ForgeConstants
|
||||
final String assetsDir = StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "svn") ? "../forge-gui/" : "";
|
||||
ForgeConstants.init(assetsDir);
|
||||
|
||||
// HACK - temporary solution to "Comparison method violates it's general contract!" crash
|
||||
System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user