Move duplicated states to DmiState::duplicates list

Author: SpaiR

src/main/java/io/github/spair/byond/dmi/Dmi.java

@@ -33,15 +33,15 @@ public Dmi(final String name, final int width, final int height,
         this.states = states;
 
         states.forEach((stateName, dmiState) -> {
-            if (dmiState.isDuplicate()) {
+            if (dmiState.hasDuplicates()) {
                 duplicateStatesNames.add(stateName);
             }
         });
     }
 
     public void addState(final DmiState dmiState) {
         states.put(dmiState.getName(), dmiState);
-        if (dmiState.isDuplicate()) {
+        if (dmiState.hasDuplicates()) {
             duplicateStatesNames.add(dmiState.getName());
         }
     }

src/main/java/io/github/spair/byond/dmi/DmiState.java

@@ -18,7 +18,7 @@ public class DmiState {
 
     private DmiMetaEntry meta;
     private Map<SpriteDir, List<DmiSprite>> sprites = new HashMap<>();
-    private boolean isDuplicate;
+    private List<DmiState> duplicates = new ArrayList<>();
 
     public String getName() {
         return meta.getName();
@@ -52,11 +52,19 @@ public double[] getHotspot() {
         return meta.getHotspot();
     }
 
+    public boolean hasDuplicates() {
+        return !duplicates.isEmpty();
+    }
+
     public void addSprite(final DmiSprite sprite) {
         List<DmiSprite> spriteList = sprites.computeIfAbsent(sprite.getDir(), k -> new ArrayList<>());
         spriteList.add(sprite);
     }
 
+    public void addDuplicate(final DmiState dmiState) {
+        duplicates.add(dmiState);
+    }
+
     /**
      * Returns the first available sprite.
      * That means, that sprite will be the first frame and {@link SpriteDir#SOUTH} dir.

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

@@ -35,13 +35,7 @@ Map<String, DmiState> extractStates(final BufferedImage dmiImage, final DmiMeta
 
         for (DmiMetaEntry metaEntry : dmiMeta.getMetas()) {
             val stateName = metaEntry.getName();
-
-            if (dmiStates.containsKey(stateName)) {
-                dmiStates.get(stateName).setDuplicate(true);
-                continue;
-            }
-
-            List<DmiSprite> allSprites = new ArrayList<>();
+            val allSprites = new ArrayList<DmiSprite>();
 
             for (int frameNumber = 1; frameNumber <= metaEntry.getFrames(); frameNumber++) {
                 for (int dirCount = 1; dirCount <= metaEntry.getDirs(); dirCount++) {
@@ -65,7 +59,11 @@ Map<String, DmiState> extractStates(final BufferedImage dmiImage, final DmiMeta
             dmiState.setMeta(metaEntry);
             dmiState.setSprites(distributeAllSpritesInMap(allSprites));
 
-            dmiStates.put(stateName, dmiState);
+            if (dmiStates.containsKey(stateName)) {
+                dmiStates.get(stateName).addDuplicate(dmiState);
+            } else {
+                dmiStates.put(stateName, dmiState);
+            }
         }
 
         return dmiStates;

src/test/java/io/github/spair/byond/dmi/DmiTest.java

@@ -20,15 +20,14 @@ public void setUp() {
     @Test
     public void testCheckForDuplicatesWhenExists() {
         DmiState dmiState1 = new DmiState();
-        dmiState1.setDuplicate(true);
+        dmiState1.addDuplicate(new DmiState());
         dmiState1.setMeta(new DmiMetaEntry("1", 0, 0, null, false, false, false, null));
 
         DmiState dmiState2 = new DmiState();
-        dmiState2.setDuplicate(true);
+        dmiState2.addDuplicate(new DmiState());
         dmiState2.setMeta(new DmiMetaEntry("2", 0, 0, null, false, false, false, null));
 
         DmiState dmiState3 = new DmiState();
-        dmiState3.setDuplicate(false);
         dmiState3.setMeta(new DmiMetaEntry("3", 0, 0, null, false, false, false, null));
 
         Dmi dmi = new Dmi();

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

@@ -66,6 +66,6 @@ public void testExtractStatesWithDuplicates() throws Exception {
 
         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());
+        assertTrue(states.get("down").hasDuplicates());
     }
 }