v0.23-beta

Author: SaturninTheAlien

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'pekaeds'
-version '0.22-beta'
+version '0.23-beta'
 
 repositories {
     mavenCentral()

src/main/java/pekaeds/PekaEDS.java

@@ -14,12 +14,12 @@
 import pekaeds.ui.misc.AppEnum;
 import pekaeds.ui.misc.AppSelectionDialog;
 import pekaeds.ui.misc.InitialSetupDialog;
-import pekaeds.ui.misc.LookAndFeelHelper;
 import pekaep.PekaEPGUI;
 import pekase3.PekaSE3GUI;
 import pk2.filesystem.FHSHelper;
 import pk2.filesystem.PK2FileSystem;
 import pk2.settings.Settings;
+import pk2.util.LookAndFeelHelper;
 
 public class PekaEDS {
     private static AppEnum selectedApp = AppEnum.NOT_SELECTED;

src/main/java/pekaeds/data/PekaEDSVersion.java

@@ -1,5 +1,5 @@
 package pekaeds.data;
 
 public class PekaEDSVersion {
-    public static final String VERSION_STRING = "0.22 beta";
+    public static final String VERSION_STRING = "0.23 beta";
 }

src/main/java/pekaeds/ui/minimappanel/MiniMapPanel.java

@@ -6,8 +6,8 @@
 import pekaeds.ui.listeners.PK2SectorConsumer;
 import pekaeds.ui.listeners.TileChangeListener;
 import pekaeds.ui.mappanel.MapPanel;
-import pekaeds.ui.misc.LookAndFeelHelper;
 import pk2.level.PK2LevelSector;
+import pk2.util.LookAndFeelHelper;
 
 import java.awt.*;
 import java.awt.event.MouseEvent;

src/main/java/pekaeds/ui/misc/InitialSetupDialog.java

@@ -4,6 +4,7 @@
 import pekaeds.data.PekaEDSVersion;
 import pk2.filesystem.FHSHelper;
 import pk2.settings.Settings;
+import pk2.util.LookAndFeelHelper;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;

src/main/java/pekaeds/ui/settings/PanelLookAndFeel.java

@@ -6,8 +6,8 @@
 
 import net.miginfocom.swing.MigLayout;
 import pekaeds.ui.main.IPekaEdsApp;
-import pekaeds.ui.misc.LookAndFeelHelper;
 import pk2.settings.Settings;
+import pk2.util.LookAndFeelHelper;
 
 public class PanelLookAndFeel extends JPanel implements ISettingsPanel {
 

src/main/java/pekase3/PekaSE3GUI.java

@@ -118,6 +118,14 @@ public void pathSet() {
 
 
     private void loadSprite(File file) {
+
+        if (this.editPane!=null && this.editPane.unsavedChangesPresent()) {
+            int result = JOptionPane.showConfirmDialog(null, "Unsaved changes. Save?");
+            if(result==JOptionPane.YES_OPTION){
+                this.saveSprite();
+            }
+        }
+
         PK2Sprite sprite = null;
 
         try {
@@ -157,6 +165,19 @@ private void loadSprite(File file) {
             JOptionPane.showMessageDialog(null, "Unable to load the sprite file.\n" + e.getMessage(), "Unable to load sprite!", JOptionPane.ERROR_MESSAGE);
         }
     }
+
+    private void saveSprite(){
+        if (this.loadedFile == null) {
+            var fc = new SpriteFileChooser();
+            
+            if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) {
+                saveSprite(fc.getSelectedFile());
+            }
+        } else {
+            saveSprite(loadedFile);
+        }
+    }
+    
 
     private void saveSprite(File file) {
 
@@ -245,6 +266,8 @@ private void createMenuBar() {
         //menuBar.add(mProfiles);
         menuBar.add(mOther);
     }
+
+
 
     private void addListeners() {
 
@@ -263,15 +286,7 @@ private void addListeners() {
         });
 
         miFSave.addActionListener(e -> {
-            if (loadedFile == null) {
-                var fc = new SpriteFileChooser();
-                
-                if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) {
-                    saveSprite(fc.getSelectedFile());
-                }
-            } else {
-                saveSprite(loadedFile);
-            }
+            saveSprite();            
         });
 
         miFSaveAs.addActionListener(e -> {

src/main/java/pekase3/panels/FrameImagePanel.java

@@ -2,7 +2,7 @@
 
 import javax.swing.*;
 
-import pekaeds.ui.misc.LookAndFeelHelper;
+import pk2.util.LookAndFeelHelper;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

src/main/java/pekase3/panels/imagepanel/ImagePanel.java

@@ -4,6 +4,7 @@
 import pekase3.filefilters.ImageFilter;
 import pekase3.listener.UnsavedChangesListener;
 import pekase3.panels.PekaSE2Panel;
+import pekase3.panels.animation.AnimationsEditPanel;
 import pekase3.panels.imagepanel.spritesheetpanel.SpriteSheetPanel;
 import pekase3.panels.imagepanel.spritesheetpanel.FrameEditMode.*;
 import pekase3.panels.spriteeditpane.SpriteEditPaneModel;
@@ -14,7 +15,6 @@
 
 import org.tinylog.Logger;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -54,9 +54,13 @@ public class ImagePanel extends PekaSE2Panel {
     private JToggleButton lastSelectedButton;
 
     private SpriteProfile profile;
+    private PK2Sprite sprite;
+
+    private final AnimationsEditPanel animationPanel;
 
-    public ImagePanel(SpriteEditPaneModel spriteModel) {
-        this.spriteEditModel = spriteModel;        
+    public ImagePanel(SpriteEditPaneModel spriteModel, AnimationsEditPanel animationPanel) {
+        this.spriteEditModel = spriteModel;
+        this.animationPanel = animationPanel;
         setup();
     }
 
@@ -286,7 +290,8 @@ public void mousePressed(MouseEvent e) {
     }
 
     @Override
-    public void setSprite(PK2Sprite sprite) {       
+    public void setSprite(PK2Sprite sprite) {
+        this.sprite = sprite; 
         tfImage.setText(sprite.getImageFile());
 
         this.image = sprite.getImage();
@@ -393,12 +398,14 @@ private void loadImage(File file, boolean resetFrameData) {
         this.image = null;
 
         try {
-            this.image = ImageIO.read(file);
-            this.image = GFXUtils.makeTransparent(this.image);
 
-            //spriteEditModel.setSpriteImage(this.image);
-            spriteSheetPanel.setImage(this.image, resetFrameData);
-            //pnlBorderColor.setBackground(spriteSheetPanel.getBorderColor());
+            this.sprite.setImageFile(file.getName());
+            GFXUtils.loadSpriteImageSheet(this.sprite, file);
+            this.spriteSheetPanel.setImage(this.sprite.getImage(), resetFrameData); 
+
+            this.animationPanel.setSprite(this.sprite); //To update sprite animations
+            
+
         } catch (IOException ex) {
             Logger.warn(ex);
         }

src/main/java/pekase3/panels/spriteeditpane/SpriteEditPane.java

@@ -15,10 +15,7 @@
 import pekase3.panels.soundspanel.SoundsPanel;
 import pk2.profile.SpriteProfile;
 import pk2.sprite.PK2Sprite;
-import pk2.util.GFXUtils;
 
-import java.awt.image.BufferedImage;
-import java.awt.image.RasterFormatException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,8 +44,8 @@ public SpriteEditPane() {
     private void setup() {
         panels = new ArrayList<>();
 
-        imagePanel = new ImagePanel(model);
         animationsPanel = new AnimationsEditPanel();
+        imagePanel = new ImagePanel(model, animationsPanel);
         aiListPanel = new AIListPanel();
         soundsPanel = new SoundsPanel();
         attacksPanel = new AttacksPanel();
@@ -90,14 +87,6 @@ public PK2Sprite setValues() {
 
     public void setSprite(PK2Sprite sprite) {
         unsavedChangesListener.setIgnoreChanges(true);
-
-        try{
-            sprite.setFramesList(GFXUtils.cutFrames(sprite.getImage(), sprite.getFramesAmount(), sprite.getFrameX(), sprite.getFrameY(), sprite.getFrameWidth(), sprite.getFrameHeight()));
-        }
-        catch(RasterFormatException e){
-            JOptionPane.showMessageDialog(this, "Your sprite could be badly cropped!","Cannot cut sprite frames!", JOptionPane.WARNING_MESSAGE);
-            sprite.setFramesList(new ArrayList<BufferedImage>());
-        }
 
         model.setSprite(sprite);
         for(PekaSE2Panel p: panels){