Merge branch 'development' into abhi-test

.github/workflows/codeql-analysis.yml

@@ -37,6 +37,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
       
+    - name: Setup Java JDK
+      uses: actions/setup-java@v1.4.3
+      with:
+        # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
+        java-version: 11
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/maven.yml

@@ -12,6 +12,6 @@ jobs:
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml

src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java

@@ -606,12 +606,12 @@ public class FUtil
 
     public static Date getUnixDate(long unix)
     {
-        return new Date(unix * 1000);
+        return new Date(unix);
     }
 
     public static long getUnixTime()
     {
-        return System.currentTimeMillis() / 1000L;
+        return Instant.now().getEpochSecond();
     }
 
     public static long getUnixTime(Date date)
@@ -621,7 +621,7 @@ public class FUtil
             return 0;
         }
 
-        return date.getTime() / 1000L;
+        return date.getTime();
     }
 
     public static String getNMSVersion()