Merge pull request #3 from cons-tan-tan/feature

Unify notification log
cons-tan-tan · Mar 30, 2024 · e592d3d · e592d3d
2 parents ba39dee + 71f4477
commit e592d3d
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/src/main/java/bqlogging/BetterQuestLogging.java b/src/main/java/bqlogging/BetterQuestLogging.java
@@ -1,5 +1,6 @@
 package bqlogging;
 
+import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
@@ -13,10 +14,13 @@
 import betterquesting.api.questing.IQuest;
 import betterquesting.api2.utils.QuestTranslation;
 import betterquesting.questing.QuestDatabase;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
 
 @Mod(
     modid = BetterQuestLogging.MODID,
@@ -30,6 +34,9 @@ public class BetterQuestLogging {
     public static final String MODID = "bqlogging";
     public static final Logger LOG = LogManager.getLogger(MODID);
 
+    private static final Set<UUID> COMPLETED_QUESTS = new HashSet<>();
+    private static int tickCount = 60;
+
     // @SidedProxy(clientSide = MODID + ".ClientProxy", serverSide = MODID + ".CommonProxy")
     // public static CommonProxy proxy;
 
@@ -41,6 +48,9 @@ public void preInit(FMLPreInitializationEvent event) {
         if (Loader.isModLoaded("betterquesting")) {
             LOG.info("BetterQuesting is already loaded");
             MinecraftForge.EVENT_BUS.register(this);
+            FMLCommonHandler.instance()
+                .bus()
+                .register(this);
         } else {
             LOG.error("BetterQuesting is not loaded");
         }
@@ -51,12 +61,21 @@ public void onQuestEvent(QuestEvent event) {
         if (event.getType() != QuestEvent.Type.COMPLETED) {
             return;
         }
-        Set<UUID> questIds = event.getQuestIDs();
-        if (questIds.isEmpty()) {
+        COMPLETED_QUESTS.addAll(event.getQuestIDs());
+    }
+
+    @SubscribeEvent(priority = EventPriority.LOW)
+    public void onServerTick(TickEvent.ServerTickEvent event) {
+        if (event.phase != TickEvent.Phase.START) {
+            return;
+        }
+
+        if (--tickCount != 0) {
             return;
         }
+        tickCount = 60;
 
-        questIds.forEach(uuid -> {
+        COMPLETED_QUESTS.forEach(uuid -> {
             IQuest quest = QuestDatabase.INSTANCE.get(uuid);
             if (quest == null) {
                 LOG.error(String.format("Quest with ID %s does not exist", uuid));
@@ -66,10 +85,11 @@ public void onQuestEvent(QuestEvent event) {
             }
             LOG.info(
                 String.format(
-                    "Quest Completed: %s",
+                    "Quest Complete: %s",
                     QuestTranslation.translateQuestName(uuid, quest)
                         .replaceAll("§.", "")));
         });
+        COMPLETED_QUESTS.clear();
     }
 
     // @Mod.EventHandler