Create symbolic links to allow asset files to be shared amongst gui projects

forge-m-android/.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="assets"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

forge-m-android/.project

@@ -30,4 +30,11 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>assets</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/forge-gui/res</locationURI>
+		</link>
+	</linkedResources>
 </projectDescription>

forge-m-base/src/forge/ForgeGame.java

@@ -8,7 +8,7 @@ public class ForgeGame implements ApplicationListener {
     @Override
     public void create () {
         FSkin.loadLight("default", true);
-        FSkin.loadFull(true);
+        //FSkin.loadFull(true);
     }
 
     @Override

forge-m-base/src/forge/gui/toolbox/FSkin.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
+import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Texture;
@@ -1051,15 +1052,22 @@ public class FSkin {
     public static ArrayList<String> getSkinDirectoryNames() {
         final ArrayList<String> mySkins = new ArrayList<String>();
 
-        final FileHandle dir = Gdx.files.internal(FILE_SKINS_DIR);
+        final FileHandle dir;
-        final String[] children = dir.file().list();
+        if (Gdx.app.getType() == ApplicationType.Desktop) {
-        if (children == null) {
+            dir = Gdx.files.internal("./bin/" + FILE_SKINS_DIR); //needed to iterate over directory for Desktop
+        }
+        else {
+            dir = Gdx.files.internal(FILE_SKINS_DIR);
+        }
+        if (!dir.exists() || !dir.isDirectory()) {
             System.err.println("FSkin > can't find skins directory!");
-        } else {
+        }
-            for (int i = 0; i < children.length; i++) {
+        else {
-                if (children[i].equalsIgnoreCase(".svn")) { continue; }
+            for (FileHandle skinFile : dir.list()) {
-                if (children[i].equalsIgnoreCase(".DS_Store")) { continue; }
+                String skinName = skinFile.name();
-                mySkins.add(children[i]);
+                if (skinName.equalsIgnoreCase(".svn")) { continue; }
+                if (skinName.equalsIgnoreCase(".DS_Store")) { continue; }
+                mySkins.add(skinName);
             }
         }
 

forge-m-desktop/.project

@@ -18,7 +18,7 @@
 		<link>
 			<name>assets</name>
 			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/forge-m-android/assets</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/forge-gui/res</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>