386

src/data/changelog/386.md

@@ -0,0 +1,3 @@
+- Bugfixes
+- Improved stability
+- UI improvements

src/data/tree/filtersVanilla.txt

@@ -191,7 +191,6 @@ root.image.gui = assets.minecraft.textures.gui.*
 
 root.image.misc = assets.minecraft.textures.misc.* | assets.minecraft.textures.painting.* | assets.minecraft.textures.effect.*
 
-root.image.entity.misc.chest = assets.minecraft.textures.entity.chest.*
 root.image.entity.misc = assets.minecraft.textures.entity.endercrystal.* | assets.minecraft.textures.entity.arrow | assets.minecraft.textures.entity.beacon_beam | assets.minecraft.textures.entity.boat | assets.minecraft.textures.entity.end_portal | assets.minecraft.textures.entity.enchanting_table_book | assets.minecraft.textures.entity.experience_orb | assets.minecraft.textures.entity.lead_knot | assets.minecraft.textures.entity.minecart | assets.minecraft.textures.entity.sign
 
 root.image.entity.armor = assets.minecraft.textures.models.armor.*
@@ -215,8 +214,13 @@ root.image.entity.mob.wolf = assets.minecraft.textures.entity.wolf.*
 root.image.entity.mob.zombie = assets.minecraft.textures.entity.zombie.*
 root.image.entity.mob = assets.minecraft.textures.entity.silverfish | assets.minecraft.textures.entity.bat | assets.minecraft.textures.entity.blaze | assets.minecraft.textures.entity.chicken | assets.minecraft.textures.entity.iron_golem | assets.minecraft.textures.entity.snowman | assets.minecraft.textures.entity.squid | assets.minecraft.textures.entity.witch | assets.minecraft.textures.entity.zombie_pigman | assets.minecraft.textures.entity.steve
 
+# Chests moved to blocks to make it easier to find
+root.image.block.chest = assets.minecraft.textures.entity.chest.*
+
 root.image.entity = assets.minecraft.textures.entity.*
 
+
+
 root.image.block.redstone.machines = assets.minecraft.textures.blocks.mob_spawner | assets.minecraft.textures.blocks.command_block | assets.minecraft.textures.blocks.dispenser_* | assets.minecraft.textures.blocks.dropper_* | assets.minecraft.textures.blocks.hopper_* | assets.minecraft.textures.blocks.jukebox_* | assets.minecraft.textures.blocks.noteblock | assets.minecraft.textures.blocks.piston_* | assets.minecraft.textures.blocks.redstone_lamp_* | assets.minecraft.textures.blocks.tnt_*
 root.image.block.redstone.circuitry = assets.minecraft.textures.blocks.comparator_* | assets.minecraft.textures.blocks.daylight_detector_* | assets.minecraft.textures.blocks.lever | assets.minecraft.textures.blocks.redstone_dust_* | assets.minecraft.textures.blocks.redstone_torch_* | assets.minecraft.textures.blocks.repeater_* | assets.minecraft.textures.blocks.trip_wire*
 root.image.block.redstone = NULL 

src/data/tree/groupsVanilla.txt

@@ -61,8 +61,7 @@ root.image.entity.mob.wither = Wither
 root.image.entity.mob.wolf = Wolf
 root.image.entity.mob.zombie = Zombie		
 root.image.entity.misc = Other
-root.image.entity.misc.chest = Chests
-root.image.entity.misc.chest = Ender Crystal		
+root.image.block.chest = Chests	
 root.image.gui = Menu & Gui	
 root.image.gui.achievement = Achievement Screen
 root.image.gui.map = Maps

src/net/mightypork/rpw/Const.java

@@ -13,7 +13,7 @@
 
 public class Const {
 
-	public static final int VERSION_SERIAL = 385;
+	public static final int VERSION_SERIAL = 386;
 
 	public static final String VERSION = VersionUtils.getVersionString(VERSION_SERIAL);
 	public static final int VERSION_MAJOR = VersionUtils.getVersionMajor(VERSION_SERIAL);

src/net/mightypork/rpw/gui/Icons.java

@@ -101,12 +101,12 @@ public class Icons {
 	public static ImageIcon DIALOG_QUESTION;
 	public static ImageIcon DIALOG_WARNING;
 
-	private static ImageIcon IMAGE_ERROR_16;
-	private static ImageIcon IMAGE_ERROR_32;
-	private static ImageIcon IMAGE_ERROR_64;
-	private static ImageIcon IMAGE_ERROR_128;
+	public static ImageIcon IMAGE_ERROR_16;
+	public static ImageIcon IMAGE_ERROR_32;
+	public static ImageIcon IMAGE_ERROR_64;
+	public static ImageIcon IMAGE_ERROR_128;
 
-	private static ImageIcon IMAGE_NOT_FOUND;
+	public static ImageIcon IMAGE_NOT_FOUND;
 
 
 	public static void init()

src/net/mightypork/rpw/gui/widgets/JPanelWithBackground.java

@@ -12,7 +12,7 @@ public class JPanelWithBackground extends JPanel {
 	private Image image;
 
 
-	public void setbackground(Image image)
+	public void setBackground(Image image)
 	{
 		this.image = image;
 		repaint();

src/net/mightypork/rpw/gui/widgets/SidePanel.java

@@ -28,6 +28,7 @@
 import net.mightypork.rpw.tree.assets.tree.AssetTreeNode;
 import net.mightypork.rpw.utils.Utils;
 import net.mightypork.rpw.utils.files.FileUtils;
+import net.mightypork.rpw.utils.logging.Log;
 
 import org.jdesktop.swingx.JXLabel;
 import org.jdesktop.swingx.JXPanel;
@@ -77,7 +78,8 @@ public class SidePanel {
 	private Border previewBorder;
 
 
-	public SidePanel() {
+	public SidePanel()
+	{
 		panel = new JXPanel();
 		panel.setBorder(BorderFactory.createEmptyBorder(Gui.GAP, Gui.GAPL, Gui.GAP, Gui.GAPL));
 
@@ -331,18 +333,26 @@ private Box createProjectInfoBox()
 
 		hb = new HBox();
 			hb.glue();
-			hb.add(projectIconLabel = new JXLabel());
+
+			JPanel jPanel = new JPanel();
+
+			hb.add(jPanel);
+
+			jPanel.add(projectIconLabel = new JXLabel());
 
 			//@formatter:off
-			projectIconLabel.setBorder(
+			jPanel.setBorder(
 					BorderFactory.createTitledBorder(
 							new CompoundBorder(
 									BorderFactory.createLineBorder(new Color(0x666666)),
 									BorderFactory.createEmptyBorder(5, 5, 5, 5)
 							),
 							"Pack Icon"
 					)
-			);	
+			);
+
+			jPanel.setMaximumSize(new Dimension(145, 165));
+			jPanel.setPreferredSize(new Dimension(145, 165));
 
 			projectIconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 
@@ -386,6 +396,7 @@ public void updateProjectInfo()
 			final ImageIcon ic = Icons.getIconFromFile(iconFile, new Dimension(128, 128));
 			projectIconLabel.setIcon(ic);
 
+
 			infoBox.setVisible(true);
 
 		} else {
@@ -419,41 +430,51 @@ public void updatePreview(AssetTreeNode selected)
 
 			displayedLeaf = leaf;
 
-			InputStream in;
+			InputStream in = null;
 
 			final EAsset type = leaf.getAssetType();
 
 			if (type.isImage()) {
 				// image asset
 				final String key = leaf.getAssetKey();
 				if (key.startsWith("assets.minecraft.textures.font.")) {
-					previewImageBg.setbackground(Icons.TRANSPARENT_FONTS.getImage());
+					previewImageBg.setBackground(Icons.TRANSPARENT_FONTS.getImage());
 				} else {
-					previewImageBg.setbackground(Icons.TRANSPARENT.getImage());
+					previewImageBg.setBackground(Icons.TRANSPARENT.getImage());
 				}
 
 				try {
+
 					in = Sources.getAssetStream(source, leaf.getAssetKey());
-				} catch (final IOException e) {
-					return;
-				}
-
-				if (in == null) {
-					previewImage.setIcon(null);
-				} else {
-					final ImageIcon i = Icons.getIconFromStream(in, new Dimension(256, 256));
+					if (in == null) {
+						previewImage.setIcon(null);
+					} else {
+						final ImageIcon i = Icons.getIconFromStream(in, new Dimension(256, 256));
+
+						previewImage.setIcon(i);
+
+						final String fn = Utils.cropStringAtEnd(fname, 25);
+
+						previewImageBorder.setTitle(fn + " (" + i.getDescription() + ")");
+					}
+
+					final boolean metaInProj = leaf.isMetaProvidedByProject();
+					btnMetaI.setIcon(metaInProj ? Icons.MENU_EDIT : Icons.MENU_NEW);
 
-					previewImage.setIcon(i);
+					previewCardLayout.show(previewPanel, IMAGE);
 
-					final String fn = Utils.cropStringAtEnd(fname, 25);
 
-					previewImageBorder.setTitle(fn + " (" + i.getDescription() + ")");
+				} catch (IOException e) {
+					Log.e(e);
+					return;
+				} finally {
+					try {
+						if (in != null) in.close();
+					} catch (IOException e1) {
+						e1.printStackTrace();
+					}
 				}
 
-				final boolean metaInProj = leaf.isMetaProvidedByProject();
-				btnMetaI.setIcon(metaInProj ? Icons.MENU_EDIT : Icons.MENU_NEW);
-
-				previewCardLayout.show(previewPanel, IMAGE);
 
 			} else if (type.isText()) {
 				// text asset
@@ -462,21 +483,28 @@ public void updatePreview(AssetTreeNode selected)
 				try {
 					in = Sources.getAssetStream(leaf.resolveAssetSource(), leaf.getAssetKey());
 					text = FileUtils.streamToString(in, 100);
-				} catch (final Exception e) {
-					return;
-				}
-
-				if (in == null) {
-					previewText.setText("");
-				} else {
-					previewText.setText(text);
+					if (in == null) {
+						previewText.setText("");
+					} else {
+						previewText.setText(text);
+
+						previewTextBorder.setTitle(fname);
+					}
 
-					previewTextBorder.setTitle(fname);
+					previewText.setCaretPosition(0); // scroll to top
+
+					previewCardLayout.show(previewPanel, TEXT);
+				} catch (IOException e) {
+					Log.e(e);
+					return;
+				} finally {
+					try {
+						if (in != null) in.close();
+					} catch (IOException e1) {
+						e1.printStackTrace();
+					}
 				}
 
-				previewText.setCaretPosition(0); // scroll to top
-
-				previewCardLayout.show(previewPanel, TEXT);
 
 			} else if (type.isSound()) {
 				// sound asset

src/net/mightypork/rpw/project/Project.java

@@ -153,8 +153,9 @@ public void reload()
 
 			saveToTmp();
 
-		} catch (final IOException e) {
+		} catch (final Exception e) {
 			Log.w(getLogPrefix() + "Project data files could not be loaded.");
+			Alerts.error(App.getFrame(), "An arror occured while loading the project.\nPlease, check the log for details.");
 		}
 
 	}

src/net/mightypork/rpw/tasks/TaskExportProject.java

@@ -1,6 +1,7 @@
 package net.mightypork.rpw.tasks;
 
 
+import java.awt.EventQueue;
 import java.io.File;
 
 import javax.swing.JOptionPane;
@@ -19,34 +20,43 @@ public static void showDialog()
 	{
 		if (!Projects.isOpen()) return;
 
-		final Project project = Projects.getActive();
-
-		final FileChooser fc = new FileChooser(App.getFrame(), FilePath.EXPORT, "Export project", FileChooser.ZIP, true, false, false);
-
-		final File dir = fc.getCurrentDirectory();
-		final File file = new File(dir, project.getName() + ".zip");
-		fc.setSelectedFile(file);
-
-		fc.showDialog("Export");
-		if (!fc.approved()) {
-			return;
-		}
-
-		final File f = fc.getSelectedFile();
-
-		if (f.exists()) {
-			//@formatter:off
-			final int overwrite = Alerts.askYesNoCancel(
-					App.getFrame(),
-					"File Exists",
-					"File \"" + f.getName() + "\" already exists.\n" +
-					"Do you want to overwrite it?"
-			);
-			//@formatter:on
+		EventQueue.invokeLater(new Runnable() {
 
-			if (overwrite != JOptionPane.YES_OPTION) return;
-		}
+			@Override
+			public void run()
+			{
+				final Project project = Projects.getActive();
+
+				final FileChooser fc = new FileChooser(App.getFrame(), FilePath.EXPORT, "Export project", FileChooser.ZIP, true, false, false);
+
+				final File dir = fc.getCurrentDirectory();
+				final File file = new File(dir, project.getName() + ".zip");
+				fc.setSelectedFile(file);
+
+				fc.showDialog("Export");
+				if (!fc.approved()) {
+					return;
+				}
+
+				final File f = fc.getSelectedFile();
+
+				if (f.exists()) {
+					//@formatter:off
+					final int overwrite = Alerts.askYesNoCancel(
+							App.getFrame(),
+							"File Exists",
+							"File \"" + f.getName() + "\" already exists.\n" +
+							"Do you want to overwrite it?"
+					);
+					//@formatter:on
+
+					if (overwrite != JOptionPane.YES_OPTION) return;
+				}
+
+				Tasks.taskExportProject(f, null);
+			}
+		});
+
 
-		Tasks.taskExportProject(f, null);
 	}
 }