diff --git a/src/main/java/ExtensionArmoredClass.java b/src/main/java/ExtensionArmoredClass.java index 2ab9b32..60ca915 100644 --- a/src/main/java/ExtensionArmoredClass.java +++ b/src/main/java/ExtensionArmoredClass.java @@ -14,10 +14,12 @@ public class ExtensionArmoredClass { } if (strs.length == 9) { - return new DrawingTank(Integer.parseInt(strs[0]), + var armoredCar = new DrawingTank(Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), Color.decode(strs[2]), Color.decode(strs[3]), Boolean.parseBoolean((strs[4])), Boolean.parseBoolean(strs[5])); + armoredCar.drawingCaterpillar = CreateIDrawingCaterpillar(String.join(_separatorForObject, Arrays.copyOfRange(strs, 6, strs.length))); + return armoredCar; } return null; } diff --git a/src/main/java/MapWithSetArmoredCarsGeneric.java b/src/main/java/MapWithSetArmoredCarsGeneric.java index cb7be80..295ee64 100644 --- a/src/main/java/MapWithSetArmoredCarsGeneric.java +++ b/src/main/java/MapWithSetArmoredCarsGeneric.java @@ -1,5 +1,7 @@ import java.awt.*; import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.Collections; public class MapWithSetArmoredCarsGeneric { @@ -147,7 +149,10 @@ public class MapWithSetArmoredCarsGeneric reverse = new ArrayList(); + _setCars.GetArmoredCars().forEach(reverse::add); + Collections.reverse(reverse); + for (var armoredCar : reverse) { data += String.format("%s%s", armoredCar.GetInfo(), separatorData); } diff --git a/src/main/java/MapsCollection.java b/src/main/java/MapsCollection.java index 137df14..cc6fc03 100644 --- a/src/main/java/MapsCollection.java +++ b/src/main/java/MapsCollection.java @@ -62,6 +62,7 @@ public class MapsCollection { for (var key : _mapStorages.keySet()) { writter.write(String.format("%s%s%s", key, separatorDict, _mapStorages.get(key).GetData(separatorDict, separatorData))); + writter.newLine(); } } catch (IOException e) {