From 1e53bc7d1f4242caee1655c00b4e42c804aa50e8 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 3 Jan 2022 18:50:50 +0100
Subject: [PATCH] Refactor gachapon logging

---
 .../java/scripting/npc/NPCConversationManager.java     |  2 +-
 src/main/java/server/gachapon/Gachapon.java            | 10 +++++++++-
 src/main/java/tools/LogHelper.java                     |  8 --------
 src/main/resources/log4j2.xml                          |  9 +++++++++
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java
index 707f9b8857..5bec357dea 100644
--- a/src/main/java/scripting/npc/NPCConversationManager.java
+++ b/src/main/java/scripting/npc/NPCConversationManager.java
@@ -413,7 +413,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
                 (getNpc() - NpcId.GACHAPON_HENESYS) : getNpc() == NpcId.GACHAPON_NLC ? 8 : 9];
         String map = c.getChannelServer().getMapFactory().getMap(mapId).getMapName();
 
-        LogHelper.logGacha(getPlayer(), item.getId(), map);
+        Gachapon.log(getPlayer(), item.getId(), map);
 
         if (item.getTier() > 0) { //Uncommon and Rare
             Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.gachaponMessage(itemGained, map, getPlayer()));
diff --git a/src/main/java/server/gachapon/Gachapon.java b/src/main/java/server/gachapon/Gachapon.java
index 21cbd61fd1..a7fd78da1d 100644
--- a/src/main/java/server/gachapon/Gachapon.java
+++ b/src/main/java/server/gachapon/Gachapon.java
@@ -21,7 +21,10 @@
  */
 package server.gachapon;
 
+import client.Character;
 import constants.id.NpcId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import server.ItemInformationProvider;
 import tools.Randomizer;
 
@@ -29,7 +32,7 @@ import tools.Randomizer;
  * @author Alan (SharpAceX)
  */
 public class Gachapon {
-
+    private static final Logger log = LoggerFactory.getLogger(Gachapon.class);
     private static final Gachapon instance = new Gachapon();
 
     public static Gachapon getInstance() {
@@ -162,4 +165,9 @@ public class Gachapon {
             return id;
         }
     }
+
+    public static void log(Character player, int itemId, String map) {
+        String itemName = ItemInformationProvider.getInstance().getName(itemId);
+        log.info("{} got a {} ({}) from the {} gachapon.", player.getName(), itemName, itemId, map);
+    }
 }
diff --git a/src/main/java/tools/LogHelper.java b/src/main/java/tools/LogHelper.java
index 89283d8e5b..f0fc648bcf 100644
--- a/src/main/java/tools/LogHelper.java
+++ b/src/main/java/tools/LogHelper.java
@@ -1,7 +1,6 @@
 package tools;
 
 import client.Character;
-import server.ItemInformationProvider;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,11 +22,4 @@ public class LogHelper {
         String log = player.getName() + (gotPrize ? " used a maple leaf to buy " + operation : " redeemed " + operation + " VP for a leaf") + " - " + timeStamp;
         FilePrinter.print(FilePrinter.LOG_LEAF, log);
     }
-
-    public static void logGacha(Character player, int itemid, String map) {
-        String itemName = ItemInformationProvider.getInstance().getName(itemid);
-        String timeStamp = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss").format(new Date());
-        String log = player.getName() + " got a " + itemName + "(" + itemid + ") from the " + map + " gachapon. - " + timeStamp;
-        FilePrinter.print(FilePrinter.LOG_GACHAPON, log);
-    }
 }
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 240546a97c..461f066839 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -54,6 +54,12 @@
                 <Pattern>${standard-pattern}</Pattern>
             </PatternLayout>
         </File>
+
+        <File name="GachaponFile" fileName="logs/gachapon.log">
+            <PatternLayout>
+                <Pattern>${standard-pattern}</Pattern>
+            </PatternLayout>
+        </File>
     </Appenders>
 
     <Loggers>
@@ -79,6 +85,9 @@
         <Logger name="server.ChatLogger" level="info" additivity="false">
             <AppenderRef ref="ChatFile"/>
         </Logger>
+        <Logger name="server.gachapon.Gachapon" level="info" additivity="false">
+            <AppenderRef ref="GachaponFile"/>
+        </Logger>
 
         <Logger name="com.zaxxer.hikari" level="info"/>
         <Logger name="io.netty" level="info"/>