pr: address comments of #76

Author: NotToDisturb

src/main/java/entralinked/network/http/pgl/PglHandler.java

@@ -466,11 +466,11 @@ private void handleUploadSaveData(PglRequest request, Context ctx) throws IOExce
             inputStream.skip(Offsets.ADVENTURE_START_TIME_SUB_OFFSET);
             trainerInfo.setAdventureStartTime(TrainerInfoReader.readAdventureStartTime(inputStream));
 
-            inputStream.skipTo(Offsets.MONEY_AND_BADGES);
+            inputStream.skipTo(Offsets.getMoneyAndBadges(request.gameVersion()));
             trainerInfo.setMoney(TrainerInfoReader.readLong(inputStream));
             trainerInfo.setGymBadges(TrainerInfoReader.readGymBadges(inputStream));
         }
-        
+
         // Update and save player information
         player.setStatus(PlayerStatus.SLEEPING);
         player.setGameVersion(request.gameVersion());

src/main/java/entralinked/savefile/Offsets.java

@@ -1,5 +1,7 @@
 package entralinked.savefile;
 
+import entralinked.GameVersion;
+
 public class Offsets {
     public static final int TRAINER_INFO = 0x19400;
     public static final int TRAINER_INFO_SIZE = 0x67;
@@ -13,10 +15,15 @@ public class Offsets {
     public static final int PLAYTIME_OFFSET = 0x24;
 
     public static final int DREAM_WORLD_INFO = 0x1D300;
-    public static final int POKEMON_INFO_SUB_OFFSET = 0x1D300;
+    public static final int POKEMON_INFO_SUB_OFFSET = 0x8;
 
     public static final int ADVENTURE_START_TIME_OFFSET = 0x1D900;
-    public static final int ADVENTURE_START_TIME_SUB_OFFSET = 0x1D900;
+    public static final int ADVENTURE_START_TIME_SUB_OFFSET = 0x34;
+
+    public static final int MONEY_AND_BADGES_VERSION_1 = 0x21200;
+    public static final int MONEY_AND_BADGES_VERSION_2 = 0x21100;
 
-    public static final int MONEY_AND_BADGES = 0x21200;
+    public static int getMoneyAndBadges(GameVersion gameVersion) {
+        return gameVersion.isVersion2() ? MONEY_AND_BADGES_VERSION_2 : MONEY_AND_BADGES_VERSION_1;
+    }
 }

src/main/java/entralinked/savefile/PkmnInfoReader.java

@@ -69,22 +69,23 @@ public static PkmnInfo readPokeInfo(InputStream inputStream) throws IOException
         int form = (buffer.getByte(64) >> 3) & 0x1F;
         boolean genderless = ((buffer.getByte(64) >> 2) & 1) == 1;
         boolean female = ((buffer.getByte(64) >> 1) & 1) == 1;
+        int natureByte = buffer.getByte(65);
         PkmnGender gender = genderless ? PkmnGender.GENDERLESS : female ? PkmnGender.FEMALE : PkmnGender.MALE;
-        PkmnNature nature = PkmnNature.valueOf(buffer.getByte(65));
+        PkmnNature nature = PkmnNature.valueOf(natureByte);
         String nickname = getString(buffer, 72, 20);
         String trainerName = getString(buffer, 104, 14);
 
         // Try release buffer
         if(!buffer.release()) {
             logger.warn("Buffer was not deallocated!");
         }
-        
+
         // Loosely verify data
-        if(species < 1 || species > 649) throw new IOException("Invalid species");
-        if(heldItem < 0 || heldItem > 638) throw new IOException("Invalid held item");
-        if(ability < 1 || ability > 164) throw new IOException("Invalid ability");
-        if(level < 1 || level > 100) throw new IOException("Level is out of range");
-        if(nature == null) throw new IOException("Invalid nature");
+        if(species < 1 || species > 649) throw new IOException(String.format("Invalid species: %d", species));
+        if(heldItem < 0 || heldItem > 638) throw new IOException(String.format("Invalid held item: %d", heldItem));
+        if(ability < 1 || ability > 164) throw new IOException(String.format("Invalid ability: %d", ability));
+        if(level < 1 || level > 100) throw new IOException(String.format("Level is out of range: %d", level));
+        if(nature == null) throw new IOException(String.format("Invalid nature: %d", natureByte));
 
         // Create record
         return new PkmnInfo(nickname, trainerName, nature, gender, species, personality,

src/main/java/entralinked/savefile/TrainerInfoReader.java

@@ -7,6 +7,8 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.PooledByteBufAllocator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,6 +21,8 @@ public class TrainerInfoReader {
     private static final byte ZERO_BYTE = (byte) 0x00;
     private static final byte FF_BYTE = (byte) 0xFF;
 
+
+    private static final Logger logger = LogManager.getLogger();
     private static final ByteBufAllocator bufferAllocator = PooledByteBufAllocator.DEFAULT;
 
     public static TrainerInfo readTrainerInfo(InputStream inputStream) throws IOException {
@@ -33,6 +37,11 @@ public static TrainerInfo readTrainerInfo(InputStream inputStream) throws IOExce
         TrainerGender gender = TrainerGender.valueOf(buffer.getUnsignedByte(Offsets.GENDER_OFFSET));
         Playtime playtime = readPlaytime(buffer);
 
+        // Try release buffer
+        if(!buffer.release()) {
+            logger.warn("Buffer was not deallocated!");
+        }
+
         return new TrainerInfo(trainerName, trainerId, secretId, country, region, gender, playtime);
     }
 
@@ -65,7 +74,15 @@ public static long readAdventureStartTime(InputStream inputStream) throws IOExce
     public static long readLong(InputStream inputStream) throws IOException {
         ByteBuf buffer = bufferAllocator.buffer(4);
         buffer.writeBytes(inputStream, 4);
-        return buffer.getUnsignedIntLE(0);
+
+        long read = buffer.getUnsignedIntLE(0);
+
+        // Try release buffer
+        if(!buffer.release()) {
+            logger.warn("Buffer was not deallocated!");
+        }
+
+        return read;
     }
 
     public static List<GymBadge> readGymBadges(InputStream inputStream) throws IOException {
@@ -79,6 +96,12 @@ public static List<GymBadge> readGymBadges(InputStream inputStream) throws IOExc
                 gymBadges.add(badge);
             }
         }
+
+        // Try release buffer
+        if(!buffer.release()) {
+            logger.warn("Buffer was not deallocated!");
+        }
+
         return gymBadges;
     }
 }

src/main/java/entralinked/utility/PointedInputStream.java

@@ -1,11 +1,13 @@
 package entralinked.utility;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 public class PointedInputStream extends FilterInputStream {
-    private static long pointer = 0;
+    private long pointer = 0;
 
     public PointedInputStream(InputStream inputStream) {
         super(inputStream);
@@ -19,7 +21,7 @@ public int read() throws IOException {
     }
 
     @Override
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(@NotNull byte[] b, int off, int len) throws IOException {
         int bytes = super.read(b, off, len);
         pointer += bytes;
         return bytes;