Now log line split with deviders

Author: LionZXY

README.md

@@ -9,7 +9,7 @@
 |:--------------------:|:------:|:------:|:------:|:--------------------------------------------------------------------------:|:--------:|:-------:|:---------:|
 | Field Length (bytes) | 4 byte | 4 byte | 4 byte | 1 byte ('0' for Remove, '1' for Insert, '2' for update, '100' for unknown) |  4 byte  |  8 byte |   8 byte  |
 
-Total: 33 bytes per line
+Total: 33 bytes per line (+1 byte for devider)
 
 Filename: /{save}/{world/dimension}/*.bytelog
 

src/main/java/ru/lionzxy/fastlogblock/io/log/LogReader.java

@@ -50,16 +50,20 @@ public List<BlockChangeEventModel> readEventByPos(final BlockPos blockPos) throw
         final TLongSet needBlockName = new TLongHashSet();
         final TIntSet needNickName = new TIntHashSet();
         iterateByFile((byteList) -> {
-            final PrepareReadBlockChangeEvent prepareReadBlockChangeEvent = prepareOrNullByPos(byteList.toArray(),
-                    needPosX, needPosY, needPosZ);
-            if (prepareReadBlockChangeEvent == null) {
-                return;
+            try {
+                final PrepareReadBlockChangeEvent prepareReadBlockChangeEvent = prepareOrNullByPos(byteList.toArray(),
+                        needPosX, needPosY, needPosZ);
+                if (prepareReadBlockChangeEvent == null) {
+                    return;
+                }
+
+                needBlockName.add(prepareReadBlockChangeEvent.getBlockId());
+                needNickName.add(prepareReadBlockChangeEvent.getPlayerid());
+
+                prepareEvents.add(prepareReadBlockChangeEvent);
+            } catch (Exception e) {
+                FMLLog.log.warn("Your logfile is corrupt!", e);
             }
-
-            needBlockName.add(prepareReadBlockChangeEvent.getBlockId());
-            needNickName.add(prepareReadBlockChangeEvent.getPlayerid());
-
-            prepareEvents.add(prepareReadBlockChangeEvent);
         });
 
         final TIntObjectMap<ASCIString> idToNick = CollectionUtils.toHashMap(needNickName, id -> nickMapper.getById(id));
@@ -103,6 +107,6 @@ public void sync() throws IOException {
 
     @Override
     protected boolean checkLineEnd(final TByteArrayList arrayList, final byte endByte) {
-        return arrayList.size() == Constants.SIZE_LOGLINE;
+        return endByte == Constants.DEVIDER_SYMBOL;
     }
 }

src/main/java/ru/lionzxy/fastlogblock/io/log/LogWritter.java

@@ -42,6 +42,7 @@ public void putEvent(final BlockChangeEventModel blockChangeEventModel) {
         byteBuffer.putInt(nickMapper.getOrPutUser(blockChangeEventModel.getPlayernick()));
         byteBuffer.putLong(blockMapper.getOrPutBlock(blockChangeEventModel.getNameblock()));
         byteBuffer.putLong(blockChangeEventModel.getTimestamp().getTime());
+        byteBuffer.put(Constants.DEVIDER_SYMBOL);
 
         try {
             os.write(byteBuffer.array());

src/main/java/ru/lionzxy/fastlogblock/utils/Constants.java

@@ -1,6 +1,6 @@
 package ru.lionzxy.fastlogblock.utils;
 
 public class Constants {
-    public static final int SIZE_LOGLINE = Integer.BYTES * 4 + Long.BYTES * 2 + Byte.BYTES;
+    public static final int SIZE_LOGLINE = Integer.BYTES * 4 + Long.BYTES * 2 + Byte.BYTES * 2;
     public static final byte DEVIDER_SYMBOL = 28;
 }