implement ignoring fully transparent sprites

ATCS_JAR.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.19.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.18.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

packaging/ATCS_latest

@@ -1 +1 @@
-v0.6.19
+v0.6.18

packaging/Windows/ATCS_Installer.nsi

@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.19"
+!define VERSION "0.6.18"
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "javaw"
 
@@ -88,7 +88,7 @@ Section install
   file "C:\AT\ATCS_source\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
   file "C:\AT\ATCS_source\lib\junit-4.10.jar"
   file "C:\AT\ATCS_source\lib\json_simple-1.1.jar"
-  file "C:\AT\temp\ATCS_v0.6.19\ATCS_v${VERSION}.jar"
+  file "C:\AT\temp\ATCS_v0.6.18\ATCS_v${VERSION}.jar"
   file "C:\AT\ATCS_source\lib\rsyntaxtextarea.jar"
   file "C:\AT\ATCS_source\lib\prefuse.jar"
   file "C:\AT\ATCS_source\lib\bsh-2.0b4.jar"
@@ -172,4 +172,4 @@ Function GetJRE
  JreFound:
   Pop $R1
   Exch $R0
-FunctionEnd
+FunctionEnd

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -1,227 +1,227 @@
-package com.gpl.rpg.atcontentstudio;
+package com.gpl.rpg.atcontentstudio;
-
+
-import java.awt.Color;
+import java.awt.Color;
-import java.awt.Desktop;
+import java.awt.Desktop;
-import java.awt.Dimension;
+import java.awt.Dimension;
-import java.awt.Font;
+import java.awt.Font;
-import java.awt.Toolkit;
+import java.awt.Toolkit;
-import java.awt.event.WindowAdapter;
+import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import java.awt.event.WindowEvent;
-import java.io.BufferedReader;
+import java.io.BufferedReader;
-import java.io.File;
+import java.io.File;
-import java.io.IOException;
+import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStreamReader;
-import java.net.MalformedURLException;
+import java.net.MalformedURLException;
-import java.net.URISyntaxException;
+import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.URL;
-import java.util.Enumeration;
+import java.util.Enumeration;
-import java.util.HashMap;
+import java.util.HashMap;
-import java.util.LinkedList;
+import java.util.LinkedList;
-import java.util.List;
+import java.util.List;
-import java.util.Map;
+import java.util.Map;
-import java.util.logging.Level;
+import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.logging.Logger;
-
+
-import javax.swing.JEditorPane;
+import javax.swing.JEditorPane;
-import javax.swing.JLabel;
+import javax.swing.JLabel;
-import javax.swing.JOptionPane;
+import javax.swing.JOptionPane;
-import javax.swing.UIDefaults;
+import javax.swing.UIDefaults;
-import javax.swing.UIManager;
+import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
+import javax.swing.event.HyperlinkListener;
-import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.FontUIResource;
-
+
-import prefuse.data.expression.parser.ExpressionParser;
+import prefuse.data.expression.parser.ExpressionParser;
-
+
-import com.gpl.rpg.atcontentstudio.model.Workspace;
+import com.gpl.rpg.atcontentstudio.model.Workspace;
-import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
+import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
-import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
-import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
+import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
-
+
-
+
-public class ATContentStudio {
+public class ATContentStudio {
-
+
-	public static final String APP_NAME = "Andor's Trail Content Studio";
+	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.19";
+	public static final String APP_VERSION = "v0.6.18";
-	
+	
-	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
+	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
-	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
+	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
-	
+	
-	public static final String FONT_SCALE_ENV_VAR_NAME = "FONT_SCALE";
+	public static final String FONT_SCALE_ENV_VAR_NAME = "FONT_SCALE";
-
+
-	public static boolean STARTED = false;
+	public static boolean STARTED = false;
-	public static float SCALING=1.0f;
+	public static float SCALING=1.0f;
-	public static StudioFrame frame = null;
+	public static StudioFrame frame = null;
-
+
-	//Need to keep a strong reference to it, to avoid garbage collection that'll reset these loggers.
+	//Need to keep a strong reference to it, to avoid garbage collection that'll reset these loggers.
-	public static final List<Logger> configuredLoggers = new LinkedList<Logger>();
+	public static final List<Logger> configuredLoggers = new LinkedList<Logger>();
-	
+	
-	/**
+	/**
-	 * @param args
+	 * @param args
-	 */
+	 */
-	public static void main(String[] args) {
+	public static void main(String[] args) {
-		String fontScaling = System.getProperty(FONT_SCALE_ENV_VAR_NAME);
+		String fontScaling = System.getProperty(FONT_SCALE_ENV_VAR_NAME);
-		Float fontScale = null;
+		Float fontScale = null;
-		if (fontScaling != null) {
+		if (fontScaling != null) {
-			try {
+			try {
-				fontScale = Float.parseFloat(fontScaling);
+				fontScale = Float.parseFloat(fontScaling);
-				SCALING=fontScale;
+				SCALING=fontScale;
-			} catch (NumberFormatException e) {
+			} catch (NumberFormatException e) {
-				System.err.println("Failed to parse font scaling parameter. Using default.");
+				System.err.println("Failed to parse font scaling parameter. Using default.");
-				e.printStackTrace();
+				e.printStackTrace();
-			}
+			}
-		}
+		}
-		
+		
-		ConfigCache.init();
+		ConfigCache.init();
-		
+		
-		try {
+		try {
-			String laf = ConfigCache.getFavoriteLaFClassName();
+			String laf = ConfigCache.getFavoriteLaFClassName();
-			if (laf == null) laf = UIManager.getSystemLookAndFeelClassName();
+			if (laf == null) laf = UIManager.getSystemLookAndFeelClassName();
-			UIManager.setLookAndFeel(laf);
+			UIManager.setLookAndFeel(laf);
-		} catch (ClassNotFoundException e) {
+		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		} catch (InstantiationException e) {
+		} catch (InstantiationException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		} catch (IllegalAccessException e) {
+		} catch (IllegalAccessException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		} catch (UnsupportedLookAndFeelException e) {
+		} catch (UnsupportedLookAndFeelException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		}
+		}
-		
+		
-		
+		
-		scaleUIFont();
+		scaleUIFont();
-
+
-		//Need to keep a strong reference to it, to avoid garbage collection that'll reset this setting.
+		//Need to keep a strong reference to it, to avoid garbage collection that'll reset this setting.
-		Logger l = Logger.getLogger(ExpressionParser.class.getName());
+		Logger l = Logger.getLogger(ExpressionParser.class.getName());
-		l.setLevel(Level.OFF);
+		l.setLevel(Level.OFF);
-		configuredLoggers.add(l); 
+		configuredLoggers.add(l); 
-		
+		
-		final WorkspaceSelector wsSelect = new WorkspaceSelector();
+		final WorkspaceSelector wsSelect = new WorkspaceSelector();
-		wsSelect.pack();
+		wsSelect.pack();
-		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
+		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
-		Dimension wdim = wsSelect.getSize();
+		Dimension wdim = wsSelect.getSize();
-		wsSelect.setLocation((sdim.width - wdim.width)/2, (sdim.height - wdim.height)/2);
+		wsSelect.setLocation((sdim.width - wdim.width)/2, (sdim.height - wdim.height)/2);
-		wsSelect.setVisible(true);
+		wsSelect.setVisible(true);
-		
+		
-		wsSelect.addWindowListener(new WindowAdapter() {
+		wsSelect.addWindowListener(new WindowAdapter() {
-			@Override
+			@Override
-			public synchronized void windowClosed(WindowEvent e) {
+			public synchronized void windowClosed(WindowEvent e) {
-				if (wsSelect.selected != null && !STARTED) {
+				if (wsSelect.selected != null && !STARTED) {
-					ATContentStudio.STARTED = true;
+					ATContentStudio.STARTED = true;
-					final File workspaceRoot = new File(wsSelect.selected);
+					final File workspaceRoot = new File(wsSelect.selected);
-					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
+					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
-						public void run() {
+						public void run() {
-							Workspace.setActive(workspaceRoot);
+							Workspace.setActive(workspaceRoot);
-							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
+							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
-								new Thread() {
+								new Thread() {
-									public void run() {checkUpdate();}
+									public void run() {checkUpdate();}
-								}.start();
+								}.start();
-							}
+							}
-							frame = new StudioFrame(APP_NAME+" "+APP_VERSION);
+							frame = new StudioFrame(APP_NAME+" "+APP_VERSION);
-							frame.setVisible(true);
+							frame.setVisible(true);
-							frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
+							frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
-						};
+						};
-					});
+					});
-					for (File f : ConfigCache.getKnownWorkspaces()) {
+					for (File f : ConfigCache.getKnownWorkspaces()) {
-						if (workspaceRoot.equals(f)) {
+						if (workspaceRoot.equals(f)) {
-							if (!workspaceRoot.equals(ConfigCache.getLatestWorkspace())) {
+							if (!workspaceRoot.equals(ConfigCache.getLatestWorkspace())) {
-								ConfigCache.setLatestWorkspace(f);
+								ConfigCache.setLatestWorkspace(f);
-							}
+							}
-							return;
+							return;
-						}
+						}
-					}
+					}
-					ConfigCache.addWorkspace(workspaceRoot);
+					ConfigCache.addWorkspace(workspaceRoot);
-					ConfigCache.setLatestWorkspace(workspaceRoot);
+					ConfigCache.setLatestWorkspace(workspaceRoot);
-
+
-				}
+				}
-			}
+			}
-		});
+		});
-	}
+	}
-	
+	
-	private static void checkUpdate() {
+	private static void checkUpdate() {
-		BufferedReader in = null;
+		BufferedReader in = null;
-		try {
+		try {
-			URL url = new URL(CHECK_UPDATE_URL);
+			URL url = new URL(CHECK_UPDATE_URL);
-			in = new BufferedReader(new InputStreamReader(url.openStream()));
+			in = new BufferedReader(new InputStreamReader(url.openStream()));
-
+
-			String inputLine, lastLine = null;
+			String inputLine, lastLine = null;
-			while ((inputLine = in.readLine()) != null) {lastLine = inputLine;}
+			while ((inputLine = in.readLine()) != null) {lastLine = inputLine;}
-			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
+			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
-				
+				
-				// for copying style
+				// for copying style
-			    JLabel label = new JLabel();
+			    JLabel label = new JLabel();
-			    Font font = label.getFont();
+			    Font font = label.getFont();
-		        Color color = label.getBackground();
+		        Color color = label.getBackground();
-
+
-			    // create some css from the label's font
+			    // create some css from the label's font
-			    StringBuffer style = new StringBuffer("font-family:" + font.getFamily() + ";");
+			    StringBuffer style = new StringBuffer("font-family:" + font.getFamily() + ";");
-			    style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
+			    style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
-			    style.append("font-size:" + font.getSize() + "pt;");
+			    style.append("font-size:" + font.getSize() + "pt;");
-			    style.append("background-color: rgb("+color.getRed()+","+color.getGreen()+","+color.getBlue()+");");
+			    style.append("background-color: rgb("+color.getRed()+","+color.getGreen()+","+color.getBlue()+");");
-				
+				
-				JEditorPane ep = new JEditorPane("text/html", "<html><body style=\"" + style + "\">"
+				JEditorPane ep = new JEditorPane("text/html", "<html><body style=\"" + style + "\">"
-						+ "You are not running the latest ATCS version.<br/>"
+						+ "You are not running the latest ATCS version.<br/>"
-						+ "You can get the latest version ("+lastLine+") by clicking the link below.<br/>"
+						+ "You can get the latest version ("+lastLine+") by clicking the link below.<br/>"
-						+ "<a href=\""+DOWNLOAD_URL+"\">"+DOWNLOAD_URL+"</a><br/>"
+						+ "<a href=\""+DOWNLOAD_URL+"\">"+DOWNLOAD_URL+"</a><br/>"
-						+ "<br/>"
+						+ "<br/>"
-						+ "</body></html>");
+						+ "</body></html>");
-				
+				
-				ep.setEditable(false);
+				ep.setEditable(false);
-				ep.setBorder(null);
+				ep.setBorder(null);
-				
+				
-				ep.addHyperlinkListener(new HyperlinkListener() {
+				ep.addHyperlinkListener(new HyperlinkListener() {
-					
+					
-					@Override
+					@Override
-					public void hyperlinkUpdate(HyperlinkEvent e) {
+					public void hyperlinkUpdate(HyperlinkEvent e) {
-						try {
+						try {
-							if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+							if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
-								Desktop.getDesktop().browse(e.getURL().toURI());
+								Desktop.getDesktop().browse(e.getURL().toURI());
-							}
+							}
-						} catch (IOException e1) {
+						} catch (IOException e1) {
-							e1.printStackTrace();
+							e1.printStackTrace();
-						} catch (URISyntaxException e1) {
+						} catch (URISyntaxException e1) {
-							e1.printStackTrace();
+							e1.printStackTrace();
-						}
+						}
-					}
+					}
-				});
+				});
-				
+				
-				JOptionPane.showMessageDialog(null, ep, "Update available", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(null, ep, "Update available", JOptionPane.INFORMATION_MESSAGE);
-			}
+			}
-		} catch (MalformedURLException e) {
+		} catch (MalformedURLException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		} catch (IOException e) {
+		} catch (IOException e) {
-			e.printStackTrace();
+			e.printStackTrace();
-		} finally {
+		} finally {
-			try {
+			try {
-				if (in != null) in.close();
+				if (in != null) in.close();
-			} catch (IOException e) {
+			} catch (IOException e) {
-				e.printStackTrace();
+				e.printStackTrace();
-			}
+			}
-		}
+		}
-	}
+	}
-	
+	
-	public static void scaleUIFont() {
+	public static void scaleUIFont() {
-		if (SCALING != 1.0f) {
+		if (SCALING != 1.0f) {
-			System.out.println("Scaling fonts to "+SCALING);
+			System.out.println("Scaling fonts to "+SCALING);
-			UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+			UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-			Map<Object, Object> newDefaults = new HashMap<Object, Object>();
+			Map<Object, Object> newDefaults = new HashMap<Object, Object>();
-			for (Enumeration<Object> e = defaults.keys(); e.hasMoreElements();) {
+			for (Enumeration<Object> e = defaults.keys(); e.hasMoreElements();) {
-				Object key = e.nextElement();
+				Object key = e.nextElement();
-				Object value = defaults.get(key);
+				Object value = defaults.get(key);
-				if (value instanceof Font) {
+				if (value instanceof Font) {
-					Font font = (Font) value;
+					Font font = (Font) value;
-					int newSize = (int)(font.getSize() * SCALING);
+					int newSize = (int)(font.getSize() * SCALING);
-					if (value instanceof FontUIResource) {
+					if (value instanceof FontUIResource) {
-						newDefaults.put(key, new FontUIResource(font.getName(), font.getStyle(), newSize));
+						newDefaults.put(key, new FontUIResource(font.getName(), font.getStyle(), newSize));
-					} else {
+					} else {
-						newDefaults.put(key, new Font(font.getName(), font.getStyle(), newSize));
+						newDefaults.put(key, new Font(font.getName(), font.getStyle(), newSize));
-					}
+					}
-				}
+				}
-			}
+			}
-			for (Object key : newDefaults.keySet()) {
+			for (Object key : newDefaults.keySet()) {
-				defaults.put(key, newDefaults.get(key));
+				defaults.put(key, newDefaults.get(key));
-			}
+			}
-		}
+		}
-	}
+	}
-}
+}

src/com/gpl/rpg/atcontentstudio/model/maps/SpawnArea.java

@@ -11,7 +11,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
-	public int respawnSpeed = 10;
+	public int spawnchance = 10;
 	public boolean active = true;
 	public boolean ignoreAreas = false;
 	public String spawngroup_id;
@@ -21,8 +21,8 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("quantity") != null) {
 			this.quantity = Integer.parseInt(obj.getProperties().getProperty("quantity"));
 		}
-		if (obj.getProperties().getProperty("respawnspeed") != null) {
+		if (obj.getProperties().getProperty("spawnchance") != null) {
-			this.respawnSpeed = Integer.parseInt(obj.getProperties().getProperty("respawnspeed"));
+			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
 		}
 		if (obj.getProperties().getProperty("active") != null) {
 			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
@@ -82,8 +82,8 @@ public class SpawnArea extends MapObject {
 		if (quantity != 1) {
 			tmxObject.getProperties().setProperty("quantity", Integer.toString(quantity));
 		}
-		if (respawnSpeed != 10) {
+		if (spawnchance != 10) {
-			tmxObject.getProperties().setProperty("respawnspeed", Integer.toString(respawnSpeed));
+			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
 		}
 		if (!this.active) {
 			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
@@ -92,4 +92,5 @@ public class SpawnArea extends MapObject {
 			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
 		}
 	}
+	
 }

src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java

@@ -1,43 +1,34 @@
 package com.gpl.rpg.atcontentstudio.ui.sprites;
 
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
+import javax.swing.*;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JToggleButton;
-import javax.swing.ScrollPaneConstants;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet.Category;
+import com.gpl.rpg.atcontentstudio.utils.SpriteUtils;
 
 
 public class SpriteChooser extends JDialog {
 
 	private static final long serialVersionUID = -6018113265015159521L;
-	
+
 	private static final int STD_WIDTH = 32;
 	private static final int STD_HEIGHT = 32;
 	private static final int MAX_PER_ROW = 10;
-	
+
-	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category,SpriteChooser>>();
+	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category, SpriteChooser>>();
-	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category,List<Spritesheet>>>();
+	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category, List<Spritesheet>>>();
-	
+
-	
+
 	public static SpriteChooser getChooser(Project proj, Spritesheet.Category category) {
 		if (cache.get(proj) == null) {
 			cache.put(proj, new LinkedHashMap<Spritesheet.Category, SpriteChooser>());
@@ -46,13 +37,13 @@ public class SpriteChooser extends JDialog {
 			cache.get(proj).put(category, new SpriteChooser(proj, category));
 		} else {
 			List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-			for (int i=0; i<proj.getSpritesheetCount(); i++) {
+			for (int i = 0; i < proj.getSpritesheetCount(); i++) {
 				Spritesheet sheet = proj.getSpritesheet(i);
 				if (sheet.category == category) {
 					spritesheets.add(sheet);
 				}
 			}
-			if ( !spritesheets.equals(cacheValidator.get(proj).get(category)) ) {
+			if (!spritesheets.equals(cacheValidator.get(proj).get(category))) {
 				cache.get(proj).put(category, new SpriteChooser(proj, category));
 			}
 		}
@@ -65,20 +56,20 @@ public class SpriteChooser extends JDialog {
 		wanted.pack();
 		return wanted;
 	}
-	
+
 	private ButtonGroup group;
 //	private IconButton selectedOne = null;
 //	private JButton ok;
 //	private JButton cancel;
-	
+
 	public String selectedIconId = null;
-	
+
 	public SpriteChooser(Project proj, Category category) {
 		super(ATContentStudio.frame);
 		setTitle("Select a sprite");
 		setModalityType(ModalityType.APPLICATION_MODAL);
 		List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-		for (int i=0; i<proj.getSpritesheetCount(); i++) {
+		for (int i = 0; i < proj.getSpritesheetCount(); i++) {
 			Spritesheet sheet = proj.getSpritesheet(i);
 			if (sheet.category == category) {
 				spritesheets.add(sheet);
@@ -88,8 +79,8 @@ public class SpriteChooser extends JDialog {
 			cacheValidator.put(proj, new LinkedHashMap<Spritesheet.Category, List<Spritesheet>>());
 		}
 		cacheValidator.get(proj).put(category, spritesheets);
-		
+
-		
+
 		JPanel pane = new JPanel();
 		pane.setLayout(new GridBagLayout());
 		GridBagConstraints c = new GridBagConstraints();
@@ -101,16 +92,19 @@ public class SpriteChooser extends JDialog {
 		c.gridheight = 1;
 		c.anchor = GridBagConstraints.NORTHWEST;
 		c.fill = GridBagConstraints.BOTH;
-		
+
 		List<Point> reservedSlots = new ArrayList<Point>();
 		Point nextFreeSlot = new Point(0, 0);
-		
+
 		int i;
-		Image img;
+		BufferedImage img;
 		group = new ButtonGroup();
 		for (Spritesheet sheet : spritesheets) {
-			i = 0;
+            i = -1;
-			while ((img = sheet.getImage(i)) != null) {
+            while ((img = sheet.getImage(++i)) != null) {
+                if (SpriteUtils.checkIsImageEmpty(img)) {
+                    continue;
+                }
 				IconButton button = new IconButton(img, sheet.id, i);
 				group.add(button);
 				if (sheet.spriteWidth == STD_WIDTH && sheet.spriteHeight == STD_HEIGHT) {
@@ -120,7 +114,7 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx,  c.gridy);
+					nextFreeSlot.setLocation(c.gridx, c.gridy);
 				} else {
 					c.gridwidth = (sheet.spriteWidth / STD_WIDTH) + (sheet.spriteWidth % STD_WIDTH == 0 ? 0 : 1);
 					c.gridheight = (sheet.spriteHeight / STD_HEIGHT) + (sheet.spriteHeight % STD_HEIGHT == 0 ? 0 : 1);
@@ -157,15 +151,14 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx,  c.gridy);
+					nextFreeSlot.setLocation(c.gridx, c.gridy);
 				}
-				i++;
 			}
 		}
-		
+
 //		ok = new JButton("Ok");
 //		cancel = new JButton("Cancel");
-		
+
 		c.gridx = 0;
 		boolean emptyLine = false;
 		while (!emptyLine) {
@@ -178,7 +171,7 @@ public class SpriteChooser extends JDialog {
 				}
 			}
 		}
-		
+
 //		JPanel buttonPane = new JPanel();
 //		buttonPane.add(cancel, BorderLayout.WEST);
 //		buttonPane.add(ok, BorderLayout.EAST);
@@ -190,7 +183,7 @@ public class SpriteChooser extends JDialog {
 		scroller.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		wrapper.add(scroller, BorderLayout.CENTER);
 //		wrapper.add(buttonPane, BorderLayout.SOUTH);
-		
+
 //		ok.addActionListener(new ActionListener() {
 //			@Override
 //			public void actionPerformed(ActionEvent e) {
@@ -200,7 +193,7 @@ public class SpriteChooser extends JDialog {
 //				if (listener != null) listener.iconSelected(selectedIconId);
 //			}
 //		});
-		
+
 //		cancel.addActionListener(new ActionListener() {
 //			@Override
 //			public void actionPerformed(ActionEvent e) {
@@ -210,21 +203,21 @@ public class SpriteChooser extends JDialog {
 //				if (listener != null) listener.iconSelected(null);
 //			}
 //		});
-		
+
 		setContentPane(wrapper);
 	}
-	
+
 	private SpriteChooser.SelectionListener listener = null;
-	
+
 	public void setSelectionListener(SpriteChooser.SelectionListener l) {
 		listener = l;
 	}
-	
+
-	
+
 	public class IconButton extends JToggleButton {
-		
+
 		private static final long serialVersionUID = 7559407153561178455L;
-		
+
 		public String sheetId;
 		public int spriteIndex;
 
@@ -232,12 +225,12 @@ public class SpriteChooser extends JDialog {
 			super(new ImageIcon(img));
 			this.sheetId = sheetId;
 			this.spriteIndex = spriteIndex;
-			setToolTipText(sheetId+":"+spriteIndex);
+			setToolTipText(sheetId + ":" + spriteIndex);
 			addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					if (IconButton.this.isSelected()) {
-						selectedIconId = IconButton.this.sheetId+":"+IconButton.this.spriteIndex;
+						selectedIconId = IconButton.this.sheetId + ":" + IconButton.this.spriteIndex;
 						SpriteChooser.this.setVisible(false);
 						SpriteChooser.this.dispose();
 						if (listener != null) listener.iconSelected(selectedIconId);
@@ -246,9 +239,9 @@ public class SpriteChooser extends JDialog {
 			});
 		}
 	}
-	
+
 	public static interface SelectionListener {
 		public void iconSelected(String selected);
 	}
-	
+
 }

src/com/gpl/rpg/atcontentstudio/utils/SpriteUtils.java

@@ -0,0 +1,34 @@
+package com.gpl.rpg.atcontentstudio.utils;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+
+public final class SpriteUtils {
+
+	/**
+	 * Check if the image is empty (transparent )
+	 *
+	 * @param img The image to check
+	 * @return true if the image is empty
+	 */
+	public static boolean checkIsImageEmpty(BufferedImage img) {
+		int width = img.getWidth(null);
+		int height = img.getHeight(null);
+		WritableRaster raster = img.getAlphaRaster();
+		if (raster == null) {
+			return false;
+		}
+		for (int x = 0; x < width; x++) {
+			for (int y = 0; y < height; y++) {
+				//get pixel alpha value
+				int alpha = raster.getSample(x, y, 0);
+				//if alpha is not 0 then the pixel is not transparent
+				if (alpha != 0) {
+					return false;
+				}
+			}
+		}
+		//no non-transparent pixel found
+		return true;
+	}
+}