Add FastLogBlock item

LionZXY · LionZXY · commit 09cf87067e66 · 2018-01-25T14:47:53.000+03:00
diff --git a/src/main/java/ru/lionzxy/fastlogblock/FastLogBlock.java b/src/main/java/ru/lionzxy/fastlogblock/FastLogBlock.java
@@ -1,27 +1,43 @@
 package ru.lionzxy.fastlogblock;
 
+import net.minecraft.item.Item;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import ru.lionzxy.fastlogblock.handlers.EventHandlingManager;
+import ru.lionzxy.fastlogblock.ui.InfoItem;
 
-import java.io.File;
 import java.io.IOException;
 
-@Mod(modid = FastLogBlock.MODID, version = FastLogBlock.VERSION)
+@Mod(modid = FastLogBlock.MODID, version = FastLogBlock.VERSION, acceptableRemoteVersions = "*")
 public class FastLogBlock {
-    public static final File rootMinecraftPath = new File("./");
     public static final String MODID = "fastlogblock";
     public static final String VERSION = "1.0";
     private EventHandlingManager eventHandlingManager;
+    private InfoItem infoitem;
 
     @EventHandler
-    public void init(final FMLInitializationEvent event) throws IOException {
+    public void preInit(FMLPreInitializationEvent event) throws IOException {
         FMLLog.log.info("Initializing eventHandlingManager...");
         eventHandlingManager = new EventHandlingManager();
+        this.infoitem = new InfoItem(eventHandlingManager);
         FMLLog.log.info("Done!");
         MinecraftForge.EVENT_BUS.register(eventHandlingManager);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @SubscribeEvent
+    public void registerItems(RegistryEvent.Register<Item> event) {
+        event.getRegistry().registerAll(infoitem);
+    }
+
+    @EventHandler
+    public void serverStopped(final FMLServerStoppedEvent event) {
+        eventHandlingManager.stop();
     }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/handlers/EventHandlingManager.java b/src/main/java/ru/lionzxy/fastlogblock/handlers/EventHandlingManager.java
@@ -1,23 +1,41 @@
 package ru.lionzxy.fastlogblock.handlers;
 
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import ru.lionzxy.fastlogblock.io.ReadRunnable;
 import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
 import ru.lionzxy.fastlogblock.models.BlockChangeEventModelWithWorld;
+import ru.lionzxy.fastlogblock.models.FindTask;
+import ru.lionzxy.fastlogblock.models.FindTaskResult;
 
 import java.io.IOException;
-import java.util.concurrent.Executor;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
 
 public class EventHandlingManager {
-    private final Executor executor = Executors.newCachedThreadPool();
+    private final ExecutorService executor = Executors.newCachedThreadPool();
+    private final BlockingQueue<FindTaskResult> findTaskResults = new LinkedBlockingQueue<>();
+    private final ReadRunnable readRunnable;
     private final SplitterRunnable splitterRunnable;
 
     public EventHandlingManager() throws IOException {
         this.splitterRunnable = new SplitterRunnable();
+        this.readRunnable = splitterRunnable.getReadRunnable();
         splitterRunnable.runWorkers(executor);
         executor.execute(splitterRunnable);
+        executor.execute(readRunnable);
     }
 
     @SubscribeEvent
@@ -43,4 +61,62 @@ public void onBlockPlace(final BlockEvent.PlaceEvent event) {
         FMLLog.log.debug(blockChangeEventModel.toString());
         splitterRunnable.addEvent(blockChangeEventModel);
     }
+
+    @SubscribeEvent
+    public void flushUIWait(TickEvent.ServerTickEvent event) {
+        if (findTaskResults.isEmpty()) {
+            return;
+        }
+        FindTaskResult findTaskResult;
+        while ((findTaskResult = findTaskResults.poll()) != null) {
+            for (BlockChangeEventModel blockEvent : findTaskResult.getBlockChangeEventModels()) {
+                notifyAboutEvent(blockEvent, findTaskResult.getEntityPlayer());
+            }
+            if (findTaskResult.getBlockChangeEventModels().isEmpty()) {
+                findTaskResult.getEntityPlayer().sendMessage(new TextComponentTranslation("message.fastlogblock:blockinfo.event.empty"));
+            } else {
+                findTaskResult.getEntityPlayer().sendMessage(new TextComponentTranslation("message.fastlogblock:blockinfo.event.done"));
+            }
+        }
+    }
+
+    public void handleLogByPos(EntityPlayer entityPlayer, BlockPos blockPos, World world) {
+        final FindTask findTask = new FindTask(blockPos, (list, player) -> {
+            findTaskResults.add(new FindTaskResult(list, player));
+        }, world);
+        findTask.setEntityPlayer(entityPlayer);
+        readRunnable.addTaskForSearch(findTask);
+    }
+
+    public void stop() {
+        executor.shutdownNow();
+    }
+
+    private void notifyAboutEvent(BlockChangeEventModel blockEvent, EntityPlayer entityPlayer) {
+        final String dateformat = I18n.format("message.fastlogblock:blockinfo.event.dateformat");
+        final EntityPlayer playerEvent = entityPlayer.getEntityWorld().getPlayerEntityByUUID(UUID.fromString(blockEvent.getPlayernick().toString()));
+        String nickname;
+        if (playerEvent == null) {
+            if (entityPlayer.getEntityWorld().getMinecraftServer().isSinglePlayer()) {
+                nickname = entityPlayer.getDisplayNameString();
+            } else {
+                nickname = "Unknown(UUID: " + blockEvent.getPlayernick() + ")";
+            }
+        } else {
+            nickname = playerEvent.getDisplayNameString();
+        }
+        final String[] args = new String[]{new SimpleDateFormat(dateformat).format(new Date(blockEvent.getTimestamp().getTime())),
+                nickname,
+                blockEvent.getNameblock().toString()};
+        TextComponentTranslation textComponent;
+        switch (blockEvent.getBlockChangeType()) {
+            default:
+            case INSERT:
+                textComponent = new TextComponentTranslation("message.fastlogblock:blockinfo.event.insert", (Object[]) args);
+                break;
+            case REMOVE:
+                textComponent = new TextComponentTranslation("message.fastlogblock:blockinfo.event.remove", (Object[]) args);
+        }
+        entityPlayer.sendMessage(textComponent);
+    }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/handlers/SplitterRunnable.java b/src/main/java/ru/lionzxy/fastlogblock/handlers/SplitterRunnable.java
@@ -1,6 +1,8 @@
 package ru.lionzxy.fastlogblock.handlers;
 
+import net.minecraftforge.fml.common.FMLLog;
 import ru.lionzxy.fastlogblock.config.LogConfig;
+import ru.lionzxy.fastlogblock.io.ReadRunnable;
 import ru.lionzxy.fastlogblock.io.WriteRunnable;
 import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;
 import ru.lionzxy.fastlogblock.io.filesplitter.impl.BlockHashFileSplitter;
@@ -61,6 +63,8 @@ public void run() {
                 processEvent(eventQueue.take());
                 nickMapper.sync();
                 blockMapper.sync();
+            } catch (InterruptedException ie) {
+                FMLLog.log.info("Stop SplitterRunnable");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -71,6 +75,10 @@ public void addEvent(BlockChangeEventModelWithWorld blockChangeEventModelWithWor
         eventQueue.add(blockChangeEventModelWithWorld);
     }
 
+    public ReadRunnable getReadRunnable() {
+        return new ReadRunnable(fileSplitter, nickMapper, blockMapper);
+    }
+
     private void processEvent(BlockChangeEventModelWithWorld event) {
         final File file = fileSplitter.getFileByPosAndWorld(event.getBlockPos(), event.getWorld());
 
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/ReadRunnable.java b/src/main/java/ru/lionzxy/fastlogblock/io/ReadRunnable.java
@@ -1,5 +1,6 @@
 package ru.lionzxy.fastlogblock.io;
 
+import net.minecraftforge.fml.common.FMLLog;
 import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;
 import ru.lionzxy.fastlogblock.io.log.LogReader;
 import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;
@@ -35,7 +36,9 @@ public void run() {
                 final File file = fileSplitter.getFileByPosAndWorld(findTask.getBlockPos(), findTask.getWorld());
                 final LogReader logReader = new LogReader(file, blockMapper, nickMapper);
                 final List<BlockChangeEventModel> blockChangeEventModels = logReader.readEventByPos(findTask.getBlockPos());
-                findTask.getFindListener().onResultAsync(blockChangeEventModels);
+                findTask.getFindListener().onResultAsync(blockChangeEventModels, findTask.getEntityPlayer());
+            } catch (InterruptedException ie) {
+                FMLLog.log.info("Stop ReadRunnable");
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/WriteRunnable.java b/src/main/java/ru/lionzxy/fastlogblock/io/WriteRunnable.java
@@ -1,5 +1,6 @@
 package ru.lionzxy.fastlogblock.io;
 
+import net.minecraftforge.fml.common.FMLLog;
 import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;
 import ru.lionzxy.fastlogblock.io.log.LogWritter;
 import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;
@@ -52,10 +53,19 @@ public void run() {
                     }
                 });
                 withoutWork.set(true);
+            } catch (InterruptedException ie) {
+                FMLLog.log.info("Stop ReadRunnable");
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
+        writterMap.values().forEach(it -> {
+            try {
+                it.sync();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
     }
 
     public void putEvent(BlockChangeEventModelWithWorld blockChangeEventModel) {
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/FindTask.java b/src/main/java/ru/lionzxy/fastlogblock/models/FindTask.java
@@ -1,12 +1,14 @@
 package ru.lionzxy.fastlogblock.models;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class FindTask {
     private final BlockPos blockPos;
     private final IFindResultListener findListener;
     private final World world;
+    private EntityPlayer entityPlayer;
 
     public FindTask(BlockPos blockPos, IFindResultListener findListener, World world) {
         this.blockPos = blockPos;
@@ -25,4 +27,12 @@ public IFindResultListener getFindListener() {
     public World getWorld() {
         return world;
     }
+
+    public EntityPlayer getEntityPlayer() {
+        return entityPlayer;
+    }
+
+    public void setEntityPlayer(EntityPlayer entityPlayer) {
+        this.entityPlayer = entityPlayer;
+    }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/FindTaskResult.java b/src/main/java/ru/lionzxy/fastlogblock/models/FindTaskResult.java
@@ -1,4 +1,24 @@
 package ru.lionzxy.fastlogblock.models;
 
+import net.minecraft.entity.player.EntityPlayer;
+
+import java.util.List;
+
 public class FindTaskResult {
+    private final List<BlockChangeEventModel> blockChangeEventModels;
+    private final EntityPlayer entityPlayer;
+
+    public FindTaskResult(List<BlockChangeEventModel> blockChangeEventModels, EntityPlayer entityPlayer) {
+        this.blockChangeEventModels = blockChangeEventModels;
+        this.entityPlayer = entityPlayer;
+    }
+
+    public EntityPlayer getEntityPlayer() {
+        return entityPlayer;
+    }
+
+    public List<BlockChangeEventModel> getBlockChangeEventModels() {
+
+        return blockChangeEventModels;
+    }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/IFindResultListener.java b/src/main/java/ru/lionzxy/fastlogblock/models/IFindResultListener.java
@@ -1,7 +1,10 @@
 package ru.lionzxy.fastlogblock.models;
 
+import jline.internal.Nullable;
+import net.minecraft.entity.player.EntityPlayer;
+
 import java.util.List;
 
 public interface IFindResultListener {
-    void onResultAsync(List<BlockChangeEventModel> blockChangeEventModels);
+    void onResultAsync(List<BlockChangeEventModel> blockChangeEventModels, @Nullable EntityPlayer entityPlayer);
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/ui/InfoItem.java b/src/main/java/ru/lionzxy/fastlogblock/ui/InfoItem.java
@@ -0,0 +1,40 @@
+package ru.lionzxy.fastlogblock.ui;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.world.World;
+import ru.lionzxy.fastlogblock.FastLogBlock;
+import ru.lionzxy.fastlogblock.handlers.EventHandlingManager;
+
+import java.util.Objects;
+
+public class InfoItem extends Item {
+    private static final String ITEMNAME = "infoitem";
+    private final EventHandlingManager eventHandlingManager;
+
+    public InfoItem(EventHandlingManager eventHandlingManager) {
+        this.eventHandlingManager = eventHandlingManager;
+        setRegistryName(FastLogBlock.MODID, ITEMNAME);
+        final ResourceLocation registryName = Objects.requireNonNull(getRegistryName());
+        setUnlocalizedName(registryName.toString());
+        setCreativeTab(CreativeTabs.MISC);
+    }
+
+
+    @Override
+    public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+        if (worldIn.isRemote) {
+            return EnumActionResult.FAIL;
+        }
+        player.sendMessage(new TextComponentTranslation("message.fastlogblock:blockinfo.start", pos.getX(), pos.getY(), pos.getZ()));
+        eventHandlingManager.handleLogByPos(player, pos, worldIn);
+        return EnumActionResult.SUCCESS;
+    }
+}
diff --git a/src/main/java/ru/lionzxy/fastlogblock/utils/MinecraftUtils.java b/src/main/java/ru/lionzxy/fastlogblock/utils/MinecraftUtils.java
@@ -0,0 +1,10 @@
+package ru.lionzxy.fastlogblock.utils;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+public class MinecraftUtils {
+    public static boolean isOp(EntityPlayer player) {
+        player.getEntityWorld().getMinecraftServer();
+        return false;
+    }
+}
diff --git a/src/main/resources/assets/fastlogblock/lang/en_us.lang b/src/main/resources/assets/fastlogblock/lang/en_us.lang
@@ -0,0 +1,8 @@
+message.fastlogblock:blockinfo.start=§3[FastLogBlock]§f Start computing log for Position[x=%d, y=%d, z=%d]
+message.fastlogblock:blockinfo.event.insert=§2[+]§6[%s§6]§f %s: %s
+message.fastlogblock:blockinfo.event.remove=§4[-]§6[%s§6]§f %s: %s
+message.fastlogblock:blockinfo.event.done=§3[FastLogBlock]§f Done!
+message.fastlogblock:blockinfo.event.empty=§3[FastLogBlock]§f Not found changes with block
+message.fastlogblock:blockinfo.event.dateformat=dd/MM/yyyy HH:mm:ss
+
+item.fastlogblock:infoitem.name=FastBlockLog Info Item
diff --git a/src/test/java/ru/lionzxy/fastlogblock/io/WriteReadRunnableTest.java b/src/test/java/ru/lionzxy/fastlogblock/io/WriteReadRunnableTest.java
@@ -68,7 +68,7 @@ public void testRunnable() throws Exception {
         }
 
         final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
-        readRunnable.addTaskForSearch(new FindTask(new BlockPos(-2, 3, 5), list -> {
+        readRunnable.addTaskForSearch(new FindTask(new BlockPos(-2, 3, 5), (list, player) -> {
             atomicBoolean.set(4 == list.size());
         }, null));
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package ru.lionzxy.fastlogblock.io;`
`2`	`2`
	`3`	`+import net.minecraftforge.fml.common.FMLLog;`
`3`	`4`	`import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;`
`4`	`5`	`import ru.lionzxy.fastlogblock.io.log.LogWritter;`
`5`	`6`	`import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;`
`@@ -52,10 +53,19 @@ public void run() {`
`52`	`53`	`}`
`53`	`54`	`});`
`54`	`55`	`withoutWork.set(true);`
	`56`	`+ } catch (InterruptedException ie) {`
	`57`	`+ FMLLog.log.info("Stop ReadRunnable");`
`55`	`58`	`} catch (Exception e) {`
`56`	`59`	`e.printStackTrace();`
`57`	`60`	`}`
`58`	`61`	`}`
	`62`	`+ writterMap.values().forEach(it -> {`
	`63`	`+ try {`
	`64`	`+ it.sync();`
	`65`	`+ } catch (IOException e) {`
	`66`	`+ e.printStackTrace();`
	`67`	`+ }`
	`68`	`+ });`
`59`	`69`	`}`
`60`	`70`
`61`	`71`	`public void putEvent(BlockChangeEventModelWithWorld blockChangeEventModel) {`