Change file format to Mooncat Compressed Image (MCI)

Arinerron · Mar 24, 2017 · 82fe0e9 · 82fe0e9
1 parent 0c02424
commit 82fe0e9
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 5 deletions.
diff --git a/res/character_spritesheet.dat → res/.mci b/res/character_spritesheet.dat → res/.mci
diff --git a/res/character_spritesheet.mci b/res/character_spritesheet.mci
diff --git a/res/tiles/dirt.dat → res/tiles/dirt.mci b/res/tiles/dirt.dat → res/tiles/dirt.mci
diff --git a/res/tiles/gravel.dat → res/tiles/gravel.mci b/res/tiles/gravel.dat → res/tiles/gravel.mci
diff --git a/res/tiles/ice.dat → res/tiles/ice.mci b/res/tiles/ice.dat → res/tiles/ice.mci
diff --git a/res/tiles/lava.dat → res/tiles/lava.mci b/res/tiles/lava.dat → res/tiles/lava.mci
diff --git a/res/tiles/null.dat → res/tiles/null.mci b/res/tiles/null.dat → res/tiles/null.mci
diff --git a/res/tiles/water.dat → res/tiles/water.mci b/res/tiles/water.dat → res/tiles/water.mci
diff --git a/res/tileset.txt b/res/tileset.txt
@@ -8,7 +8,7 @@
 # <char> <imagepath> [keywords]
 #
 # The image path is relative to res/ folder.
-# Do not include the file extension (always PNG).
+# Do not include the file extension (always MCI).
 # If image path is null, it won't render.
 #
 # The OPTIONAL case-insensitive keywords are:

diff --git a/src/game/Game.java b/src/game/Game.java
@@ -817,7 +817,7 @@ public int charId(boolean down, boolean right, boolean up, boolean left) {
 
     // loads a bufferedimage in by filename
     public BufferedImage getImage(String name) throws Exception {
-        byte[] imagedata = decompress(Files.readAllBytes(new File("../res/" + name + ".dat").toPath()));
+        byte[] imagedata = decompress(Files.readAllBytes(new File("../res/" + name + ".mci").toPath()));
         int xmax = imagedata[0];
         int ymax = (imagedata.length - 1) / xmax;
         BufferedImage b = new BufferedImage(xmax, ymax, BufferedImage.TYPE_INT_ARGB);
@@ -830,6 +830,7 @@ public BufferedImage getImage(String name) throws Exception {
         return b;
     }
 
+    // decompresses the data into a byte array
     public static byte[] decompress(byte[] data) throws IOException, DataFormatException {
         Inflater inflater = new Inflater();
         inflater.setInput(data);
@@ -881,6 +882,7 @@ class Tile {
 }
 
 class Colors {
+    // all of the colors in the images
     public static final int[] colors = new int[] {
         0xff747474,
         0xff24188c,

diff --git a/src/tileeditor/Main.java b/src/tileeditor/Main.java
@@ -94,7 +94,7 @@ public class Main {
     public static void main(String[] args) {
         fc.setAcceptAllFileFilterUsed(true);
         fc.setMultiSelectionEnabled(false);
-        fc.setFileFilter(new FileNameExtensionFilter(".dat File", "dat"));
+        fc.setFileFilter(new FileNameExtensionFilter("Mooncat Compressed Image (.mci)", "mci"));
         refresh();
         frame = new JFrame("Tile Editor");
         panel1 = new JPanel() {
@@ -260,8 +260,8 @@ public static void save() {
                 colormap[0] = (byte)xmax;
                 File f = fc.getSelectedFile();
                 String filePath = f.getAbsolutePath();
-                if(!filePath.endsWith(".dat")) {
-                    f = new File(filePath + ".dat");
+                if(!filePath.endsWith(".mci")) {
+                    f = new File(filePath + ".mci");
                 }
                 Files.write(f.toPath(), compress(colormap));
             } catch(Exception e) {