fix parse fuel in ED 2.0

utils/src/test/java/ru/trader/edce/ParseTest.java

@@ -7,7 +7,10 @@ import org.slf4j.LoggerFactory;
 import ru.trader.edce.entities.*;
 import ru.trader.edce.entities.System;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
 
 public class ParseTest extends Assert {
@@ -68,7 +71,7 @@ public class ParseTest extends Assert {
         assertNotNull(ship);
         assertEquals("CobraMkIII", ship.getName());
         assertEquals(16, ship.getFuelCapacity(), 0.0001);
-        assertEquals(16, ship.getFuelLvl(), 0.0001);
+        assertEquals(16, ship.getFuelLevel(), 0.0001);
         assertEquals(12, ship.getCargoCapacity());
         assertEquals(8, ship.getCargoLimit());
         Module fsd = ship.getFSD();
@@ -159,7 +162,7 @@ public class ParseTest extends Assert {
         assertNotNull(ship);
         assertEquals("CobraMkIII", ship.getName());
         assertEquals(16, ship.getFuelCapacity(), 0.0001);
-        assertEquals(12.47372, ship.getFuelLvl(), 0.0001);
+        assertEquals(12.47372, ship.getFuelLevel(), 0.0001);
         assertEquals(0, ship.getCargoCapacity());
         assertEquals(0, ship.getCargoLimit());
         Module fsd = ship.getFSD();

utils/src/test/resources/edce/edce.json

@@ -6710,11 +6710,14 @@
     "cockpitBreached": false,
     "oxygenRemaining": 450000,
     "fuel": {
-      "capacity": 16,
-      "lvl": 16
-    },
-    "reserve": {
-      "lvl": 1
+      "main": {
+        "level": 16,
+        "capacity": 16
+      },
+      "reserve": {
+        "level": 1,
+        "capacity": 1
+      }
     },
     "cargo": {
       "capacity": 12,

utils/src/test/resources/edce/edce6.json

@@ -2448,11 +2448,14 @@
     "cockpitBreached": false,
     "oxygenRemaining": 450000,
     "fuel": {
-      "capacity": 16,
-      "lvl": 12.47372
-    },
-    "reserve": {
-      "lvl": 0.587228
+      "main": {
+        "level": 12.47372,
+        "capacity": 16
+      },
+      "reserve": {
+        "level": 0.587228,
+        "capacity": 1
+      }
     },
     "cargo": {
       "capacity": 0,