From dd4f2aa12d4f4953a4cee7bbbf9e688161f7a445 Mon Sep 17 00:00:00 2001
From: X-Green <35984104+X-Green@users.noreply.github.com>
Date: Sun, 12 Apr 2020 10:55:22 +0800
Subject: [PATCH 1/3] More infomation in TNT logging #1

---
 .../carpet/logging/logHelpers/TNTLogHelper.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java b/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
index 7e51f743..41078113 100644
--- a/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
+++ b/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
@@ -9,6 +9,8 @@ public class TNTLogHelper
 {
     public boolean initialized;
     private double primedX, primedY, primedZ;
+    private static long lastGametime = 0;
+    private static int tntCount = 0;
     private Vec3d primedAngle;
     /**
      * Runs when the TNT is primed. Expects the position and motion angle of the TNT.
@@ -24,18 +26,30 @@ public class TNTLogHelper
     /**
      * Runs when the TNT explodes. Expects the position of the TNT.
      */
-    public void onExploded(double x, double y, double z)
+    public void onExploded(double x, double y, double z, long gametime)
     {
+        if (!(lastGametime == gametime)){
+            tntCount = 0;
+            lastGametime = gametime;
+        }
+        tntCount++;
         LoggerRegistry.getLogger("tnt").log( (option) -> {
             switch (option)
             {
                 case "brief":
                     return new BaseText[]{Messenger.c(
+                            "g  #" + String.valueOf(tntCount),
+                            "m  @" + String.valueOf(gametime),
+                            "g  : ",
                             "l P ",Messenger.dblt("l",primedX,primedY,primedZ),
                             "w  ",Messenger.dblt("l", primedAngle.x, primedAngle.y, primedAngle.z),
                             "r  E ",Messenger.dblt("r",x, y, z))};
                 case "full":
                     return new BaseText[]{Messenger.c(
+                            "g  #" + String.valueOf(tntCount),
+                            "m  @" + String.valueOf(gametime),
+                            "g  : ",
+                            "g  #" + String.valueOf(tntCount) + ": ",
                             "l P ",Messenger.dblf("l",primedX,primedY,primedZ),
                             "w  ",Messenger.dblf("l", primedAngle.x, primedAngle.y, primedAngle.z),
                             "r  E ",Messenger.dblf("r",x, y, z))};

From ec0aecf6b5c564c38d7b5b9a669b42ec91ef9c78 Mon Sep 17 00:00:00 2001
From: X-Green <35984104+X-Green@users.noreply.github.com>
Date: Sun, 12 Apr 2020 10:56:06 +0800
Subject: [PATCH 2/3] More infomation in TNT logging #2

---
 src/main/java/carpet/mixins/TntEntityMixin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/carpet/mixins/TntEntityMixin.java b/src/main/java/carpet/mixins/TntEntityMixin.java
index 4a296389..2e67b1e5 100644
--- a/src/main/java/carpet/mixins/TntEntityMixin.java
+++ b/src/main/java/carpet/mixins/TntEntityMixin.java
@@ -72,7 +72,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
     private void onExplode(CallbackInfo ci)
     {
         if (LoggerRegistry.__tnt && logHelper != null)
-            logHelper.onExploded(getX(), getY(), getZ());
+            logHelper.onExploded(getX(), getY(), getZ(), this.world.getTime());
 
         if (mergedTNT > 1)
             for (int i = 0; i < mergedTNT - 1; i++)

From 4c5b19767e3a903596a18da756821026447b95e4 Mon Sep 17 00:00:00 2001
From: X-Green <35984104+X-Green@users.noreply.github.com>
Date: Tue, 14 Apr 2020 16:19:38 +0800
Subject: [PATCH 3/3] Update TNTLogHelper.java

---
 src/main/java/carpet/logging/logHelpers/TNTLogHelper.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java b/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
index 41078113..b968d0b4 100644
--- a/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
+++ b/src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
@@ -38,9 +38,6 @@ public class TNTLogHelper
             {
                 case "brief":
                     return new BaseText[]{Messenger.c(
-                            "g  #" + String.valueOf(tntCount),
-                            "m  @" + String.valueOf(gametime),
-                            "g  : ",
                             "l P ",Messenger.dblt("l",primedX,primedY,primedZ),
                             "w  ",Messenger.dblt("l", primedAngle.x, primedAngle.y, primedAngle.z),
                             "r  E ",Messenger.dblt("r",x, y, z))};