AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into abhi-test

Browse Source
This commit is contained in:
Ryan 2021-03-06 20:03:19 +00:00 committed by GitHub
commit f0a25fde0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/codeql-analysis.yml vendored
View File

@ -37,6 +37,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 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. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v1 uses: github/codeql-action/init@v1

2
.github/workflows/maven.yml vendored
View File

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

6
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View File

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