[Feature] Implement displaying in-game time on the minimap (#43)

* Ignore some local files.

* Implement displaying in-game time.

Author: glektarssza

.gitignore

@@ -28,12 +28,14 @@ src/minecraft/paulscode/
 !src/minecraft/net/minecraft/src/license.txt
 !src/minecraft/net/techbrew/
 
+.java-version
 /temp/
 .gradle/
+.vscode/
 tmp/
 .idea/
 eclipse/
 out/
 journeymap.iml
 journeymap.ipr
-journeymap.iws
+journeymap.iws

src/main/java/journeymap/client/data/WorldData.java

@@ -59,6 +59,7 @@ public class WorldData extends CacheLoader<Class, WorldData>
     String name;
     int dimension;
     long time;
+    long totalTime;
     boolean hardcore;
     boolean singlePlayer;
     Map<Feature, Boolean> features;
@@ -96,6 +97,18 @@ public static boolean isHardcoreAndMultiplayer()
         return world.hardcore && !world.singlePlayer;
     }
 
+    public static long getWorldTime()
+    {
+        WorldData world = DataCache.instance().getWorld(false);
+        return world.time;
+    }
+
+    public static long getWorldTotalTime()
+    {
+        WorldData world = DataCache.instance().getWorld(false);
+        return world.totalTime;
+    }
+
     private static String getServerName()
     {
         try
@@ -344,7 +357,8 @@ public WorldData load(Class aClass) throws Exception
         dimension = ForgeHelper.INSTANCE.getDimension(mc.theWorld.provider);
         hardcore = worldInfo.isHardcoreModeEnabled();
         singlePlayer = !multiplayer;
-        time = mc.theWorld.getWorldTime() % 24000L;
+        time = mc.theWorld.getWorldTime();
+        totalTime = mc.theWorld.getWorldInfo().getWorldTotalTime();
         features = FeatureManager.getAllowedFeatures();
 
         mod_name = JourneymapClient.MOD_NAME;

src/main/java/journeymap/client/model/MapState.java

@@ -9,6 +9,7 @@
 import com.google.common.base.Objects;
 import journeymap.client.JourneymapClient;
 import journeymap.client.data.DataCache;
+import journeymap.client.data.WorldData;
 import journeymap.client.feature.Feature;
 import journeymap.client.feature.FeatureManager;
 import journeymap.client.forge.helper.ForgeHelper;
@@ -25,6 +26,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentTranslation;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -50,6 +52,8 @@ public class MapState
     private File worldDir = null;
     private long lastRefresh = 0;
     private long lastMapTypeChange = 0;
+    private long worldTime = 0L;
+    private long worldTotalTime = 0L;
 
     private boolean underground = false;
 
@@ -111,6 +115,9 @@ public void refresh(Minecraft mc, EntityPlayer player, InGameMapProperties mapPr
 
         playerBiome = DataCache.getPlayer().biome;
 
+        worldTime = WorldData.getWorldTime();
+        worldTotalTime = WorldData.getWorldTotalTime();
+
         updateLastRefresh();
 
         refreshTimer.stop();
@@ -240,6 +247,14 @@ public String getPlayerBiome()
         return playerBiome;
     }
 
+    public long getWorldTime() {
+        return worldTime;
+    }
+
+    public long getWorldTotalTime() {
+        return worldTotalTime;
+    }
+
     public List<DrawStep> getDrawSteps()
     {
         return drawStepList;

src/main/java/journeymap/client/properties/MiniMapProperties.java

@@ -12,6 +12,7 @@
 import journeymap.client.ui.minimap.Position;
 import journeymap.client.ui.minimap.ReticleOrientation;
 import journeymap.client.ui.minimap.Shape;
+import journeymap.client.ui.option.TimeFormat;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -33,12 +34,18 @@ public class MiniMapProperties extends InGameMapProperties
     @Config(category = Inherit, key = "jm.minimap.position", defaultEnum = "TopRight")
     public final AtomicReference<Position> position = new AtomicReference<Position>(Position.TopRight);
 
+    @Config(category = Inherit, key = "jm.common.time_format", stringListProvider = TimeFormat.IdProvider.class)
+    public final AtomicReference<String> timeFormat = new AtomicReference<String>(new TimeFormat.IdProvider().getDefaultString());
+
     @Config(category = Inherit, key = "jm.minimap.show_fps", defaultBoolean = false)
     public final AtomicBoolean showFps = new AtomicBoolean(false);
 
     @Config(category = Inherit, key = "jm.minimap.show_biome")
     public final AtomicBoolean showBiome = new AtomicBoolean(true);
 
+    @Config(category = Inherit, key = "jm.minimap.show_time")
+    public final AtomicBoolean showTime = new AtomicBoolean(false);
+
     @Config(category = Inherit, key = "jm.minimap.show_location")
     public final AtomicBoolean showLocation = new AtomicBoolean(true);
 
@@ -164,6 +171,8 @@ public int hashCode()
         result = 31 * result + (position != null ? position.hashCode() : 0);
         result = 31 * result + (showFps != null ? showFps.hashCode() : 0);
         result = 31 * result + (showBiome != null ? showBiome.hashCode() : 0);
+        result = 31 * result + (showTime != null ? showTime.hashCode() : 0);
+        result = 31 * result + timeFormat.hashCode();
         result = 31 * result + (showLocation != null ? showLocation.hashCode() : 0);
         result = 31 * result + showWaypointLabels.hashCode();
         result = 31 * result + sizePercent.hashCode();
@@ -195,6 +204,8 @@ public String toString()
                 .add("reticleOrientation", reticleOrientation)
                 .add("shape", shape)
                 .add("showBiome", showBiome)
+                .add("showTime", showTime)
+                .add("timeFormat", timeFormat)
                 .add("showCompass", showCompass)
                 .add("showFps", showFps)
                 .add("showLocation", showLocation)

src/main/java/journeymap/client/properties/MiniMapProperties2.java

@@ -56,6 +56,8 @@ public String toString()
                 .add("position", position)
                 .add("showFps", showFps)
                 .add("showBiome", showBiome)
+                .add("showTime", showTime)
+                .add("timeFormat", timeFormat)
                 .add("showLocation", showLocation)
                 .add("showWaypointLabels", showWaypointLabels)
                 .add("sizePercent", sizePercent)

src/main/java/journeymap/client/ui/fullscreen/Fullscreen.java

@@ -1104,6 +1104,7 @@ public void setTheme(String name)
             MiniMapProperties mmp = JourneymapClient.getMiniMapProperties(JourneymapClient.getActiveMinimapId());
             mmp.shape.set(Shape.Rectangle);
             mmp.showBiome.set(false);
+            mmp.showTime.set(false);
             mmp.sizePercent.set(20);
             mmp.save();
             Theme theme = ThemeFileHandler.getThemeByName(name);
@@ -1118,4 +1119,3 @@ public void setTheme(String name)
         }
     }
 }
-

src/main/java/journeymap/client/ui/minimap/DisplayVars.java

@@ -14,6 +14,7 @@
 import journeymap.client.render.texture.TextureCache;
 import journeymap.client.render.texture.TextureImpl;
 import journeymap.client.ui.option.LocationFormat;
+import journeymap.client.ui.option.TimeFormat;
 import journeymap.client.ui.theme.Theme;
 import journeymap.client.ui.theme.ThemeCompassPoints;
 import journeymap.client.ui.theme.ThemeMinimapFrame;
@@ -48,18 +49,21 @@ public class DisplayVars
     final double reticleSegmentLength;
     final int fpsLabelHeight;
     final int locationLabelHeight;
+    final int timeLabelHeight;
     final Point2D.Double centerPoint;
+    final boolean showTime;
     final boolean showFps;
     final boolean showBiome;
     final boolean showLocation;
     final boolean showCompass;
     final boolean showReticle;
-    final LabelVars labelFps, labelLocation, labelBiome, labelDebug1, labelDebug2;
+    final LabelVars labelFps, labelLocation, labelBiome, labelTime, labelDebug1, labelDebug2;
     final Theme theme;
     final ThemeMinimapFrame minimapFrame;
     final ThemeCompassPoints minimapCompassPoints;
     final Theme.Minimap.MinimapSpec minimapSpec;
     final LocationFormat.LocationFormatKeys locationFormatKeys;
+    final TimeFormat.TimeFormatKeys timeFormatKeys;
     final boolean locationFormatVerbose;
     int marginX, marginY;
     boolean forceUnicode;
@@ -76,6 +80,7 @@ public class DisplayVars
     {
         // Immutable member and local vars
         this.scaledResolution = ForgeHelper.INSTANCE.getScaledResolution();
+        this.showTime = miniMapProperties.showTime.get();
         this.showFps = miniMapProperties.showFps.get();
         this.showBiome = miniMapProperties.showBiome.get();
         this.showLocation = miniMapProperties.showLocation.get();
@@ -87,6 +92,7 @@ public class DisplayVars
         this.displayHeight = mc.displayHeight;
         this.terrainAlpha = Math.max(0f, Math.min(1f, miniMapProperties.terrainAlpha.get() / 100f));
         this.locationFormatKeys = new LocationFormat().getFormatKeys(miniMapProperties.locationFormat.get());
+        this.timeFormatKeys = new TimeFormat().getFormatKeys(miniMapProperties.timeFormat.get());
         this.locationFormatVerbose = miniMapProperties.locationFormatVerbose.get();
         this.theme = ThemeFileHandler.getCurrentTheme();
 
@@ -135,6 +141,7 @@ public class DisplayVars
         FontRenderer fontRenderer = ForgeHelper.INSTANCE.getFontRenderer();
         fpsLabelHeight = (int) (DrawUtil.getLabelHeight(fontRenderer, minimapSpec.fpsLabel.shadow) * this.fontScale);
         locationLabelHeight = (int) (DrawUtil.getLabelHeight(fontRenderer, minimapSpec.locationLabel.shadow) * this.fontScale);
+        timeLabelHeight = (int) (DrawUtil.getLabelHeight(fontRenderer, minimapSpec.timeLabel.shadow) * this.fontScale);
 
         int compassFontScale = miniMapProperties.compassFontScale.get();
         int compassLabelHeight = 0;
@@ -177,10 +184,11 @@ public class DisplayVars
         {
             case BottomRight:
             {
-                if (!minimapSpec.labelBottomInside && (showLocation || showBiome))
+                if (!minimapSpec.labelBottomInside && (showLocation || showBiome || showTime))
                 {
                     int labels = showLocation ? 1 : 0;
                     labels += showBiome ? 1 : 0;
+                    labels += showTime ? 1 : 0;
                     marginY = Math.max(marginY, minimapSpec.labelBottomMargin + (labels * locationLabelHeight) + compassLabelHeight / 2);
                 }
 
@@ -209,10 +217,11 @@ public class DisplayVars
             }
             case BottomLeft:
             {
-                if (!minimapSpec.labelBottomInside && (showLocation || showBiome))
+                if (!minimapSpec.labelBottomInside && (showLocation || showBiome || showTime))
                 {
                     int labels = showLocation ? 1 : 0;
                     labels += showBiome ? 1 : 0;
+                    labels += showTime ? 1 : 0;
 
                     marginY = Math.max(marginY, minimapSpec.labelBottomMargin + (labels * locationLabelHeight) + compassLabelHeight / 2);
                 }
@@ -297,6 +306,20 @@ public class DisplayVars
         int labelMargin = minimapSpec.labelBottomMargin;
         int yOffset = minimapSpec.labelBottomInside ? -labelMargin : labelMargin;
 
+        if (showTime)
+        {
+            DrawUtil.VAlign vAlign = (minimapSpec.labelBottomInside) ? DrawUtil.VAlign.Above : DrawUtil.VAlign.Below;
+            labelTime = new LabelVars(this, centerX, bottomY + yOffset, DrawUtil.HAlign.Center, vAlign, fontScale, minimapSpec.timeLabel);
+            if (showLocation)
+            {
+                yOffset += timeLabelHeight;
+            }
+        }
+        else
+        {
+            labelTime = null;
+        }
+
         if (showLocation)
         {
             DrawUtil.VAlign vAlign = minimapSpec.labelBottomInside ? DrawUtil.VAlign.Above : DrawUtil.VAlign.Below;

src/main/java/journeymap/client/ui/minimap/MiniMap.java

@@ -64,6 +64,7 @@ public class MiniMap
     private String fpsLabelText;
     private String locationLabelText;
     private String biomeLabelText;
+    private String timeLabelText;
 
     private Point2D.Double centerPoint;
     private Rectangle2D.Double centerRect;
@@ -380,6 +381,10 @@ public void drawMap(boolean preview)
             {
                 dv.labelBiome.draw(biomeLabelText);
             }
+            if (dv.showTime)
+            {
+                dv.labelTime.draw(timeLabelText);
+            }
 
             // Return resolution to how it is normally scaled
             DrawUtil.sizeDisplay(dv.scaledResolution.getScaledWidth_double(), dv.scaledResolution.getScaledHeight_double());
@@ -657,8 +662,30 @@ private void updateLabels()
             biomeLabelText = state.getPlayerBiome();
         }
 
+        // Time key
+        if (dv.showTime)
+        {
+            long worldTime = state.getWorldTime();
+            long days = (worldTime / 24000L);
+            long hours = (worldTime / 1000L + 6L) % 24L;
+            long minutes = (worldTime % 1000L) * 60L / 1000L;
+
+            String am_pm = "AM";
+            if (hours > 12) {
+                hours -= 12;
+                am_pm = "PM";
+            } else if (hours == 12) {
+                am_pm = "PM";
+            }
+            timeLabelText = dv.timeFormatKeys.format(
+                String.format("%d", days),
+                String.format("%02d", hours),
+                String.format("%02d", minutes),
+                am_pm
+            );
+        }
+
         // Update timestamp
         lastLabelRefresh = System.currentTimeMillis();
     }
 }
-

src/main/java/journeymap/client/ui/option/OptionSlotFactory.java

@@ -346,6 +346,11 @@ static SlotMetadata<String> getStringSlotMetadata(PropertiesBase properties, Fie
                 button = new LocationFormat.Button(properties, property);
                 defaultTip = Constants.getString("jm.config.default", ((LocationFormat.Button) button).getLabel(slp.getDefaultString()));
             }
+            else if (slp instanceof TimeFormat.IdProvider)
+            {
+                button = new TimeFormat.Button(properties, property);
+                defaultTip = Constants.getString("jm.config.default", ((TimeFormat.Button) button).getLabel(slp.getDefaultString()));
+            }
             else
             {
                 button = new ListPropertyButton<String>(slp.getStrings(), name, properties, property);