From 88831051c826fee68dcf87ab46d96cbb064d8545 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 8 Aug 2023 09:01:34 +0900
Subject: [PATCH] revised ingame date format

---
 src/net/torvald/terrarum/App.java             |  6 +++--
 .../torvald/terrarum/gameworld/WorldTime.kt   | 22 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java
index 064d20904..0cf34fc01 100644
--- a/src/net/torvald/terrarum/App.java
+++ b/src/net/torvald/terrarum/App.java
@@ -609,19 +609,21 @@ public class App implements ApplicationListener {
 
     private static void processScreenshotRequest(FrameBuffer fb) {
         if (screenshotRequested) {
+            String msg = "Screenshot taken";
             FrameBufferManager.begin(fb);
             try {
                 Pixmap p = Pixmap.createFromFrameBuffer(0, 0, fb.getWidth(), fb.getHeight());
                 PixmapIO.writePNG(Gdx.files.absolute(defaultDir+"/Screenshot-"+String.valueOf(System.currentTimeMillis())+".png"), p, 9, true);
                 p.dispose();
-                Terrarum.INSTANCE.getIngame().sendNotification("Screenshot taken");
             }
             catch (Throwable e) {
                 e.printStackTrace();
-                Terrarum.INSTANCE.getIngame().sendNotification("Failed to take screenshot: "+e.getMessage());
+                msg = ("Failed to take screenshot: "+e.getMessage());
             }
             FrameBufferManager.end();
             screenshotRequested = false;
+
+            Terrarum.INSTANCE.getIngame().sendNotification(msg);
         }
     }
 
diff --git a/src/net/torvald/terrarum/gameworld/WorldTime.kt b/src/net/torvald/terrarum/gameworld/WorldTime.kt
index 27763b492..4bd2da5c3 100644
--- a/src/net/torvald/terrarum/gameworld/WorldTime.kt
+++ b/src/net/torvald/terrarum/gameworld/WorldTime.kt
@@ -234,14 +234,20 @@ class WorldTime(initTime: Long = 0L) {
     fun Long.toPositiveInt() = this.and(0x7FFFFFFF).toInt()
     fun Long.abs() = Math.abs(this)
 
-    /** Format: "%A, %Y %B %d %X" */
-    fun getFormattedTime() = "${getDayNameShort()}, " +
-                             "$years " +
-                             "${getMonthNameFull()} " +
-                             "$calendarDay " +
-                             "${String.format("%02d", hours)}:" +
-                             "${String.format("%02d", minutes)}:" +
-                             "${String.format("%02d", seconds)}"
+    /** Format: "ɣ%Y %B %d %A, %X" */
+    fun getFormattedTime() =
+        "ɣ$years " +
+        "${getMonthNameFull()} " +
+        "$calendarDay " +
+        "${getDayNameFull()}, " +
+        "${String.format("%02d", hours)}:" +
+        "${String.format("%02d", minutes)}:" +
+        "${String.format("%02d", seconds)}"
+    fun getFormattedCalendarDay() =
+        "ɣ$years " +
+        "${getMonthNameFull()} " +
+        "$calendarDay " +
+        "${getDayNameFull()}"
     fun getShortTime() = "${years.toString().padStart(4, '0')}-${getMonthNameShort()}-${calendarDay.toString().padStart(2, '0')}"
     fun getFilenameTime() = "${years.toString().padStart(4, '0')}${calendarMonth.toString().padStart(2, '0')}${calendarDay.toString().padStart(2, '0')}"