Changes the way of state extraction

StateExtractor won't override duplicate state so dmi slurping
will produce result similar to byond variant.

Author: SpaiR

src/main/java/io/github/spair/byond/dmi/slurper/StateExtractor.java

@@ -5,6 +5,7 @@
 import io.github.spair.byond.dmi.DmiMetaEntry;
 import io.github.spair.byond.dmi.DmiSprite;
 import io.github.spair.byond.dmi.SpriteDir;
+import lombok.val;
 
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
@@ -31,6 +32,13 @@ static Map<String, DmiState> extractStates(final BufferedImage dmiImage, final D
         Map<String, DmiState> dmiStates = new HashMap<>();
 
         for (DmiMetaEntry metaEntry : dmiMeta.getMetas()) {
+            val stateName = metaEntry.getName();
+
+            if (dmiStates.containsKey(stateName)) {
+                dmiStates.get(stateName).setDuplicate(true);
+                continue;
+            }
+
             List<DmiSprite> allSprites = new ArrayList<>();
 
             for (int frameNumber = 1; frameNumber <= metaEntry.getFrames(); frameNumber++) {
@@ -50,13 +58,12 @@ static Map<String, DmiState> extractStates(final BufferedImage dmiImage, final D
                 }
             }
 
-            DmiState dmiState = new DmiState();
+            val dmiState = new DmiState();
 
             dmiState.setMeta(metaEntry);
             dmiState.setSprites(distributeAllSpritesInMap(allSprites));
-            dmiState.setDuplicate(dmiStates.containsKey(metaEntry.getName()));
 
-            dmiStates.put(metaEntry.getName(), dmiState);
+            dmiStates.put(stateName, dmiState);
         }
 
         return dmiStates;

src/test/java/io/github/spair/byond/dmi/slurper/StateExtractorTest.java

@@ -7,12 +7,15 @@
 import org.junit.Test;
 
 import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+@SuppressWarnings("OptionalGetWithoutIsPresent")
 public class StateExtractorTest {
 
     @Test
@@ -28,7 +31,8 @@ public void testExtractStates() throws Exception {
                 )
         );
 
-        Map<String, DmiState> states = StateExtractor.extractStates(ImageIO.read(new File("src/test/resources/rollerbed_with_move.dmi")), meta);
+        BufferedImage img = ImageIO.read(new File("src/test/resources/rollerbed_with_move.dmi"));
+        Map<String, DmiState> states = StateExtractor.extractStates(img, meta);
 
         assertEquals(meta.getMetas().get(0), states.get("down").getMeta());
         assertEquals(meta.getMetas().get(1), states.get("down (M)").getMeta());
@@ -41,4 +45,25 @@ public void testExtractStates() throws Exception {
 
         assertEquals(states.get("down").getSprite(SpriteDir.SOUTH), states.get("down (M)").getSprite(SpriteDir.SOUTH));
     }
+
+    @Test
+    public void testExtractStatesWithDuplicates() throws Exception {
+        DmiMeta meta = new DmiMeta();
+        meta.setSpritesHeight(32);
+        meta.setSpritesWidth(32);
+
+        meta.setMetas(
+                Arrays.asList(
+                        new DmiMetaEntry("down", 1, 1, null, false, false, false, null),
+                        new DmiMetaEntry("down", 4, 1, null, false, false, false, null)
+                )
+        );
+
+        BufferedImage img = ImageIO.read(new File("src/test/resources/rollerbed_duplicate_states.dmi"));
+        Map<String, DmiState> states = StateExtractor.extractStates(img, meta);
+
+        assertEquals(1, states.size());
+        assertEquals("state extractor should consider first met state as main", 1, states.get("down").getMeta().getDirs());
+        assertTrue(states.get("down").isDuplicate());
+    }
 }