Compare commits

..

14 Commits

Author SHA1 Message Date
Ryan Wild
2fb8f224e7 Bump release to 2021.02-RC03 2021-03-06 23:38:46 +00:00
Ryan
b6a2c8e021 Merge pull request #29 from AtlasMediaGroup/abhi-test
Added myself to TFM
2021-03-06 20:32:04 +00:00
Ryan
f0a25fde0c Merge branch 'development' into abhi-test 2021-03-06 20:03:19 +00:00
Ryan
4324497831 Merge pull request #31 from AtlasMediaGroup/Wild1145-patch-1
Tell CodeQL we're using Java 11 hopefully
2021-03-06 20:03:02 +00:00
Ryan
14c53b7370 Merge branch 'development' into Wild1145-patch-1 2021-03-06 19:47:48 +00:00
Ryan
0396b8ad86 Merge pull request #30 from AtlasMediaGroup/frontdoor-and-banExpiry-only
fix banning/?? Resolves FS-130
2021-03-06 19:46:57 +00:00
Ryan
8ee7486afc Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-06 19:38:01 +00:00
Ryan
694d9614c5 Tell Maven to also build Java 11 for once 2021-03-06 19:28:38 +00:00
Ryan
150e25072a Tell CodeQL we're using Java 11 hopefully 2021-03-06 19:14:46 +00:00
abhiram
7d990ae2c0 [+] Remove .idea 2021-03-06 23:50:23 +05:30
Paldiu
0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only 2021-03-06 12:12:59 -06:00
Paldiu
5c097c83cb Here's to hoping this fixes that stupid ban crap. 2021-03-06 12:00:32 -06:00
abhiram
a85dd014a0 Added .idea in gitignore 2021-03-06 13:05:42 +05:30
abhiram
342df43f85 Added myself to TFM 2021-03-06 13:04:36 +05:30
5 changed files with 15 additions and 7 deletions

View File

@@ -36,6 +36,12 @@ jobs:
steps:
- 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

View File

@@ -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

1
.gitignore vendored
View File

@@ -25,6 +25,7 @@ manifest.mf
/.idea/workspace.xml
/.idea/uiDesigner.xml
/.idea/libraries
/.idea/
*.iml
# Maven excludes

View File

@@ -5,7 +5,7 @@
<groupId>me.totalfreedom</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>2021.02-RC02</version>
<version>2021.02-RC03</version>
<packaging>jar</packaging>
<properties>

View File

@@ -71,9 +71,10 @@ public class FUtil
"458de06f-36a5-4e1b-aaa6-ec1d1751c5b6", // SupItsDillon
"c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
"38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
"ba5aafba-9012-418f-9819-a7020d591068" // TFTWPhoenix
"ba5aafba-9012-418f-9819-a7020d591068", // TFTWPhoenix
"b051abdf-66d1-48c0-96ef-67fb8af96f2a" // Abhi
);
public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix");
public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix","Spigot_Abhiram");
public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
ChatColor.DARK_RED,
@@ -605,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)
@@ -620,7 +621,7 @@ public class FUtil
return 0;
}
return date.getTime() / 1000L;
return date.getTime();
}
public static String getNMSVersion()