liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Instant instead of Date

This commit is contained in:
Tungstend 2024-02-17 15:36:23 +08:00
parent 29f3b16dfe
commit 2a8581eee9
22 changed files with 172 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java
View File

@ -58,6 +58,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Instant;
import java.util.*;
import java.util.logging.Level;
import java.util.stream.Stream;
@ -104,7 +105,7 @@ public class FCLGameRepository extends DefaultGameRepository {
public Stream<Version> getDisplayVersions() {
return getVersions().stream()
.filter(v -> !v.isHidden())
.sorted(Comparator.comparing((Version v) -> v.getReleaseTime() == null ? new Date(0L) : v.getReleaseTime())
.sorted(Comparator.comparing((Version v) -> Lang.requireNonNullElse(v.getReleaseTime(), Instant.EPOCH))
.thenComparing(v -> VersionNumber.asVersion(v.getId())));
}

2
FCL/src/main/java/com/tungsten/fcl/ui/download/ModVersionAdapter.java
View File

@ -65,7 +65,7 @@ public class ModVersionAdapter extends FCLAdapter {
viewHolder.parent.setOnClickListener(v -> callback.onItemSelect(version));
viewHolder.name.setText(version.getName());
viewHolder.tag.setText(getTag(getContext(), version));
viewHolder.date.setText(FORMATTER.format(version.getDatePublished().toInstant()));
viewHolder.date.setText(FORMATTER.format(version.getDatePublished()));
return view;
}

2
FCL/src/main/java/com/tungsten/fcl/ui/download/RemoteModDownloadPage.java
View File

@ -186,7 +186,7 @@ public class RemoteModDownloadPage extends FCLTempPage implements View.OnClickLi
name.setText(modVersion.getName());
tag.setText(ModVersionAdapter.getTag(getContext(), modVersion));
date.setText(ModVersionAdapter.FORMATTER.format(modVersion.getDatePublished().toInstant()));
date.setText(ModVersionAdapter.FORMATTER.format(modVersion.getDatePublished()));
loadDependencies(modVersion);
}

2
FCL/src/main/java/com/tungsten/fcl/ui/download/RemoteVersionListAdapter.java
View File

@ -83,7 +83,7 @@ public class RemoteVersionListAdapter extends FCLAdapter {
viewHolder.tag.setBackgroundTintList(new ColorStateList(new int[][] { { } }, new int[]{ ThemeEngine.getInstance().getTheme().getColor() }));
viewHolder.tag.setText(getTag(remoteVersion));
viewHolder.date.setVisibility(remoteVersion.getReleaseDate() == null ? View.GONE : View.VISIBLE);
viewHolder.date.setText(remoteVersion.getReleaseDate() == null ? "" : formatDateTime(getContext(), remoteVersion.getReleaseDate().toInstant()));
viewHolder.date.setText(remoteVersion.getReleaseDate() == null ? "" : formatDateTime(getContext(), remoteVersion.getReleaseDate()));
return view;
}

10
FCLCore/src/main/java/com/tungsten/fclcore/download/RemoteVersion.java
View File

@ -22,7 +22,7 @@ import com.tungsten.fclcore.task.Task;
import com.tungsten.fclcore.util.ToStringBuilder;
import com.tungsten.fclcore.util.versioning.VersionNumber;
import java.util.Date;
import java.time.Instant;
import java.util.List;
import java.util.Objects;
@ -34,7 +34,7 @@ public class RemoteVersion implements Comparable<RemoteVersion> {
private final String libraryId;
private final String gameVersion;
private final String selfVersion;
private final Date releaseDate;
private final Instant releaseDate;
private final List<String> urls;
private final Type type;
@ -45,7 +45,7 @@ public class RemoteVersion implements Comparable<RemoteVersion> {
* @param selfVersion the version string of the remote version.
* @param urls the installer or universal jar original URL.
*/
public RemoteVersion(String libraryId, String gameVersion, String selfVersion, Date releaseDate, List<String> urls) {
public RemoteVersion(String libraryId, String gameVersion, String selfVersion, Instant releaseDate, List<String> urls) {
this(libraryId, gameVersion, selfVersion, releaseDate, Type.UNCATEGORIZED, urls);
}
@ -56,7 +56,7 @@ public class RemoteVersion implements Comparable<RemoteVersion> {
* @param selfVersion the version string of the remote version.
* @param urls the installer or universal jar URL.
*/
public RemoteVersion(String libraryId, String gameVersion, String selfVersion, Date releaseDate, Type type, List<String> urls) {
public RemoteVersion(String libraryId, String gameVersion, String selfVersion, Instant releaseDate, Type type, List<String> urls) {
this.libraryId = Objects.requireNonNull(libraryId);
this.gameVersion = Objects.requireNonNull(gameVersion);
this.selfVersion = Objects.requireNonNull(selfVersion);
@ -81,7 +81,7 @@ public class RemoteVersion implements Comparable<RemoteVersion> {
return getSelfVersion();
}
public Date getReleaseDate() {
public Instant getReleaseDate() {
return releaseDate;
}

4
FCLCore/src/main/java/com/tungsten/fclcore/download/fabric/FabricAPIRemoteVersion.java
View File

@ -24,7 +24,7 @@ import com.tungsten.fclcore.game.Version;
import com.tungsten.fclcore.mod.RemoteMod;
import com.tungsten.fclcore.task.Task;
import java.util.Date;
import java.time.Instant;
import java.util.List;
public class FabricAPIRemoteVersion extends RemoteVersion {
@ -38,7 +38,7 @@ public class FabricAPIRemoteVersion extends RemoteVersion {
* @param selfVersion the version string of the remote version.
* @param urls the installer or universal jar original URL.
*/
FabricAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Date datePublished, RemoteMod.Version version, List<String> urls) {
FabricAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Instant datePublished, RemoteMod.Version version, List<String> urls) {
super(LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId(), gameVersion, selfVersion, datePublished, urls);
this.fullVersion = fullVersion;

2
FCLCore/src/main/java/com/tungsten/fclcore/download/forge/ForgeBMCLVersionList.java
View File

@ -109,7 +109,7 @@ public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion>
}
versions.put(gameVersion, new ForgeRemoteVersion(
version.getGameVersion(), version.getVersion(), releaseDate == null ? null : Date.from(releaseDate), urls));
version.getGameVersion(), version.getVersion(), releaseDate, urls));
}
} finally {
lock.writeLock().unlock();

4
FCLCore/src/main/java/com/tungsten/fclcore/download/forge/ForgeRemoteVersion.java
View File

@ -23,7 +23,7 @@ import com.tungsten.fclcore.download.RemoteVersion;
import com.tungsten.fclcore.game.Version;
import com.tungsten.fclcore.task.Task;
import java.util.Date;
import java.time.Instant;
import java.util.List;
public class ForgeRemoteVersion extends RemoteVersion {
@ -34,7 +34,7 @@ public class ForgeRemoteVersion extends RemoteVersion {
* @param selfVersion the version string of the remote version.
* @param url the installer or universal jar original URL.
*/
public ForgeRemoteVersion(String gameVersion, String selfVersion, Date releaseDate, List<String> url) {
public ForgeRemoteVersion(String gameVersion, String selfVersion, Instant releaseDate, List<String> url) {
super(LibraryAnalyzer.LibraryType.FORGE.getPatchId(), gameVersion, selfVersion, releaseDate, url);
}

4
FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameRemoteVersion.java
View File

@ -24,14 +24,14 @@ import com.tungsten.fclcore.game.ReleaseType;
import com.tungsten.fclcore.game.Version;
import com.tungsten.fclcore.task.Task;
import java.util.Date;
import java.time.Instant;
import java.util.List;
public final class GameRemoteVersion extends RemoteVersion {
private final ReleaseType type;
public GameRemoteVersion(String gameVersion, String selfVersion, List<String> url, ReleaseType type, Date releaseDate) {
public GameRemoteVersion(String gameVersion, String selfVersion, List<String> url, ReleaseType type, Instant releaseDate) {
super(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId(), gameVersion, selfVersion, releaseDate, getReleaseType(type), url);
this.type = type;
}

16
FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameRemoteVersionInfo.java
View File

@ -24,7 +24,7 @@ import com.tungsten.fclcore.game.ReleaseType;
import com.tungsten.fclcore.util.StringUtils;
import com.tungsten.fclcore.util.gson.Validation;
import java.util.Date;
import java.time.Instant;
public final class GameRemoteVersionInfo implements Validation {
@ -32,10 +32,10 @@ public final class GameRemoteVersionInfo implements Validation {
private final String gameVersion;
@SerializedName("time")
private final Date time;
private final Instant time;
@SerializedName("releaseTime")
private final Date releaseTime;
private final Instant releaseTime;
@SerializedName("type")
private final ReleaseType type;
@ -44,14 +44,14 @@ public final class GameRemoteVersionInfo implements Validation {
private final String url;
public GameRemoteVersionInfo() {
this("", new Date(), new Date(), ReleaseType.UNKNOWN);
this("", Instant.now(), Instant.now(), ReleaseType.UNKNOWN);
}
public GameRemoteVersionInfo(String gameVersion, Date time, Date releaseTime, ReleaseType type) {
public GameRemoteVersionInfo(String gameVersion, Instant time, Instant releaseTime, ReleaseType type) {
this(gameVersion, time, releaseTime, type, Constants.DEFAULT_LIBRARY_URL + gameVersion + "/" + gameVersion + ".json");
}
public GameRemoteVersionInfo(String gameVersion, Date time, Date releaseTime, ReleaseType type, String url) {
public GameRemoteVersionInfo(String gameVersion, Instant time, Instant releaseTime, ReleaseType type, String url) {
this.gameVersion = gameVersion;
this.time = time;
this.releaseTime = releaseTime;
@ -63,11 +63,11 @@ public final class GameRemoteVersionInfo implements Validation {
return gameVersion;
}
public Date getTime() {
public Instant getTime() {
return time;
}
public Date getReleaseTime() {
public Instant getReleaseTime() {
return releaseTime;
}

4
FCLCore/src/main/java/com/tungsten/fclcore/download/quilt/QuiltAPIRemoteVersion.java
View File

@ -24,7 +24,7 @@ import com.tungsten.fclcore.game.Version;
import com.tungsten.fclcore.mod.RemoteMod;
import com.tungsten.fclcore.task.Task;
import java.util.Date;
import java.time.Instant;
import java.util.List;
public class QuiltAPIRemoteVersion extends RemoteVersion {
@ -38,7 +38,7 @@ public class QuiltAPIRemoteVersion extends RemoteVersion {
* @param selfVersion the version string of the remote version.
* @param urls the installer or universal jar original URL.
*/
QuiltAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Date datePublished, RemoteMod.Version version, List<String> urls) {
QuiltAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Instant datePublished, RemoteMod.Version version, List<String> urls) {
super(LibraryAnalyzer.LibraryType.QUILT_API.getPatchId(), gameVersion, selfVersion, datePublished, urls);
this.fullVersion = fullVersion;

4
FCLCore/src/main/java/com/tungsten/fclcore/game/ClassicVersion.java
View File

@ -18,8 +18,8 @@
package com.tungsten.fclcore.game;
import java.io.File;
import java.time.Instant;
import java.util.Arrays;
import java.util.Date;
/**
* The Minecraft version for 1.5.x and earlier.
@ -30,7 +30,7 @@ public class ClassicVersion extends Version {
super(true, "Classic", null, null, "${auth_player_name} ${auth_session} --workDir ${game_directory}",
null, "net.minecraft.client.Minecraft", null, null, null, null, null, null,
Arrays.asList(new ClassicLibrary("lwjgl"), new ClassicLibrary("jinput"), new ClassicLibrary("lwjgl_util")),
null, null, null, ReleaseType.UNKNOWN, new Date(), new Date(), 0, false, false, null);
null, null, null, ReleaseType.UNKNOWN, Instant.now(), Instant.now(), 0, false, false, null);
}
private static class ClassicLibrary extends Library {

16
FCLCore/src/main/java/com/tungsten/fclcore/game/Version.java
View File

@ -28,10 +28,10 @@ import com.tungsten.fclcore.util.gson.Validation;
import org.jetbrains.annotations.Nullable;
import java.time.Instant;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -61,8 +61,8 @@ public class Version implements Comparable<Version>, Validation {
private final JsonMap<DownloadType, DownloadInfo> downloads;
private final JsonMap<DownloadType, LoggingInfo> logging;
private final ReleaseType type;
private final Date time;
private final Date releaseTime;
private final Instant time;
private final Instant releaseTime;
private final Integer minimumLauncherVersion;
private final Boolean root;
private final Boolean hidden;
@ -88,7 +88,7 @@ public class Version implements Comparable<Version>, Validation {
this(false, id, version, priority, null, arguments, mainClass, null, null, null, null, null, null, libraries, null, null, null, null, null, null, null, null, null, null);
}
public Version(boolean resolved, String id, String version, Integer priority, String minecraftArguments, Arguments arguments, String mainClass, String inheritsFrom, String jar, AssetIndexInfo assetIndex, String assets, Integer complianceLevel, GameJavaVersion javaVersion, List<Library> libraries, List<CompatibilityRule> compatibilityRules, Map<DownloadType, DownloadInfo> downloads, Map<DownloadType, LoggingInfo> logging, ReleaseType type, Date time, Date releaseTime, Integer minimumLauncherVersion, Boolean hidden, Boolean root, List<Version> patches) {
public Version(boolean resolved, String id, String version, Integer priority, String minecraftArguments, Arguments arguments, String mainClass, String inheritsFrom, String jar, AssetIndexInfo assetIndex, String assets, Integer complianceLevel, GameJavaVersion javaVersion, List<Library> libraries, List<CompatibilityRule> compatibilityRules, Map<DownloadType, DownloadInfo> downloads, Map<DownloadType, LoggingInfo> logging, ReleaseType type, Instant time, Instant releaseTime, Integer minimumLauncherVersion, Boolean hidden, Boolean root, List<Version> patches) {
this.resolved = resolved;
this.id = id;
this.version = version;
@ -107,8 +107,8 @@ public class Version implements Comparable<Version>, Validation {
this.downloads = downloads == null ? null : new JsonMap<>(downloads);
this.logging = logging == null ? null : new JsonMap<>(logging);
this.type = type;
this.time = time == null ? null : (Date) time.clone();
this.releaseTime = releaseTime == null ? null : (Date) releaseTime.clone();
this.time = time;
this.releaseTime = releaseTime;
this.minimumLauncherVersion = minimumLauncherVersion;
this.hidden = hidden;
this.root = root;
@ -127,7 +127,7 @@ public class Version implements Comparable<Version>, Validation {
return mainClass;
}
public Date getTime() {
public Instant getTime() {
return time;
}
@ -153,7 +153,7 @@ public class Version implements Comparable<Version>, Validation {
return type == null ? ReleaseType.UNKNOWN : type;
}
public Date getReleaseTime() {
public Instant getReleaseTime() {
return releaseTime;
}

8
FCLCore/src/main/java/com/tungsten/fclcore/game/tlauncher/TLauncherVersion.java
View File

@ -33,7 +33,7 @@ import com.tungsten.fclcore.util.gson.Validation;
import org.jetbrains.annotations.Nullable;
import java.util.Date;
import java.time.Instant;
import java.util.List;
import java.util.stream.Collectors;
@ -55,12 +55,12 @@ public class TLauncherVersion implements Validation {
private final JsonMap<DownloadType, DownloadInfo> downloads;
private final JsonMap<DownloadType, LoggingInfo> logging;
private final ReleaseType type;
private final Date time;
private final Date releaseTime;
private final Instant time;
private final Instant releaseTime;
private final Integer minimumLauncherVersion;
private final Integer tlauncherVersion;
public TLauncherVersion(String id, String minecraftArguments, Arguments arguments, String mainClass, String inheritsFrom, String jar, AssetIndexInfo assetIndex, String assets, Integer complianceLevel, @Nullable GameJavaVersion javaVersion, List<TLauncherLibrary> libraries, List<CompatibilityRule> compatibilityRules, JsonMap<DownloadType, DownloadInfo> downloads, JsonMap<DownloadType, LoggingInfo> logging, ReleaseType type, Date time, Date releaseTime, Integer minimumLauncherVersion, Integer tlauncherVersion) {
public TLauncherVersion(String id, String minecraftArguments, Arguments arguments, String mainClass, String inheritsFrom, String jar, AssetIndexInfo assetIndex, String assets, Integer complianceLevel, @Nullable GameJavaVersion javaVersion, List<TLauncherLibrary> libraries, List<CompatibilityRule> compatibilityRules, JsonMap<DownloadType, DownloadInfo> downloads, JsonMap<DownloadType, LoggingInfo> logging, ReleaseType type, Instant time, Instant releaseTime, Integer minimumLauncherVersion, Integer tlauncherVersion) {
this.id = id;
this.minecraftArguments = minecraftArguments;
this.arguments = arguments;

8
FCLCore/src/main/java/com/tungsten/fclcore/mod/RemoteMod.java
View File

@ -24,7 +24,7 @@ import com.tungsten.fclcore.mod.modrinth.ModrinthRemoteModRepository;
import com.tungsten.fclcore.task.FileDownloadTask;
import java.io.IOException;
import java.util.Date;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@ -218,14 +218,14 @@ public class RemoteMod {
private final String name;
private final String version;
private final String changelog;
private final Date datePublished;
private final Instant datePublished;
private final VersionType versionType;
private final File file;
private final List<Dependency> dependencies;
private final List<String> gameVersions;
private final List<ModLoaderType> loaders;
public Version(IVersion self, String modid, String name, String version, String changelog, Date datePublished, VersionType versionType, File file, List<Dependency> dependencies, List<String> gameVersions, List<ModLoaderType> loaders) {
public Version(IVersion self, String modid, String name, String version, String changelog, Instant datePublished, VersionType versionType, File file, List<Dependency> dependencies, List<String> gameVersions, List<ModLoaderType> loaders) {
this.self = self;
this.modid = modid;
this.name = name;
@ -259,7 +259,7 @@ public class RemoteMod {
return changelog;
}
public Date getDatePublished() {
public Instant getDatePublished() {
return datePublished;
}

29
FCLCore/src/main/java/com/tungsten/fclcore/mod/curse/CurseAddon.java
View File

@ -26,6 +26,7 @@ import com.tungsten.fclcore.util.Pair;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -57,15 +58,15 @@ public class CurseAddon implements RemoteMod.IMod {
private final int mainFileId;
private final List<LatestFile> latestFiles;
private final List<LatestFileIndex> latestFileIndices;
private final Date dateCreated;
private final Date dateModified;
private final Date dateReleased;
private final Instant dateCreated;
private final Instant dateModified;
private final Instant dateReleased;
private final boolean allowModDistribution;
private final int gamePopularityRank;
private final boolean isAvailable;
private final int thumbsUpCount;
public CurseAddon(int id, int gameId, String name, String slug, Links links, String summary, int status, int downloadCount, boolean isFeatured, int primaryCategoryId, List<Category> categories, int classId, List<Author> authors, Logo logo, int mainFileId, List<LatestFile> latestFiles, List<LatestFileIndex> latestFileIndices, Date dateCreated, Date dateModified, Date dateReleased, boolean allowModDistribution, int gamePopularityRank, boolean isAvailable, int thumbsUpCount) {
public CurseAddon(int id, int gameId, String name, String slug, Links links, String summary, int status, int downloadCount, boolean isFeatured, int primaryCategoryId, List<Category> categories, int classId, List<Author> authors, Logo logo, int mainFileId, List<LatestFile> latestFiles, List<LatestFileIndex> latestFileIndices, Instant dateCreated, Instant dateModified, Instant dateReleased, boolean allowModDistribution, int gamePopularityRank, boolean isAvailable, int thumbsUpCount) {
this.id = id;
this.gameId = gameId;
this.name = name;
@ -160,15 +161,15 @@ public class CurseAddon implements RemoteMod.IMod {
return latestFileIndices;
}
public Date getDateCreated() {
public Instant getDateCreated() {
return dateCreated;
}
public Date getDateModified() {
public Instant getDateModified() {
return dateModified;
}
public Date getDateReleased() {
public Instant getDateReleased() {
return dateReleased;
}
@ -430,7 +431,7 @@ public class CurseAddon implements RemoteMod.IMod {
private final int releaseType;
private final int fileStatus;
private final List<LatestFileHash> hashes;
private final Date fileDate;
private final Instant fileDate;
private final int fileLength;
private final int downloadCount;
private final String downloadUrl;
@ -440,7 +441,7 @@ public class CurseAddon implements RemoteMod.IMod {
private final boolean isServerPack;
private final long fileFingerprint;
public LatestFile(int id, int gameId, int modId, boolean isAvailable, String displayName, String fileName, int releaseType, int fileStatus, List<LatestFileHash> hashes, Date fileDate, int fileLength, int downloadCount, String downloadUrl, List<String> gameVersions, List<Dependency> dependencies, int alternateFileId, boolean isServerPack, long fileFingerprint) {
public LatestFile(int id, int gameId, int modId, boolean isAvailable, String displayName, String fileName, int releaseType, int fileStatus, List<LatestFileHash> hashes, Instant fileDate, int fileLength, int downloadCount, String downloadUrl, List<String> gameVersions, List<Dependency> dependencies, int alternateFileId, boolean isServerPack, long fileFingerprint) {
this.id = id;
this.gameId = gameId;
this.modId = modId;
@ -497,7 +498,7 @@ public class CurseAddon implements RemoteMod.IMod {
return hashes;
}
public Date getFileDate() {
public Instant getFileDate() {
return fileDate;
}
@ -640,7 +641,7 @@ public class CurseAddon implements RemoteMod.IMod {
private final String slug;
private final String url;
private final String iconUrl;
private final Date dateModified;
private final Instant dateModified;
private final boolean isClass;
private final int classId;
private final int parentCategoryId;
@ -648,10 +649,10 @@ public class CurseAddon implements RemoteMod.IMod {
private transient final List<Category> subcategories;
public Category() {
this(0, 0, "", "", "", "", new Date(), false, 0, 0);
this(0, 0, "", "", "", "", Instant.now(), false, 0, 0);
}
public Category(int id, int gameId, String name, String slug, String url, String iconUrl, Date dateModified, boolean isClass, int classId, int parentCategoryId) {
public Category(int id, int gameId, String name, String slug, String url, String iconUrl, Instant dateModified, boolean isClass, int classId, int parentCategoryId) {
this.id = id;
this.gameId = gameId;
this.name = name;
@ -690,7 +691,7 @@ public class CurseAddon implements RemoteMod.IMod {
return iconUrl;
}
public Date getDateModified() {
public Instant getDateModified() {
return dateModified;
}

27
FCLCore/src/main/java/com/tungsten/fclcore/mod/modrinth/ModrinthRemoteModRepository.java
View File

@ -39,6 +39,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.file.Path;
import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -214,13 +215,13 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
private final String team;
private final Date published;
private final Instant published;
private final Date updated;
private final Instant updated;
private final List<String> versions;
public Project(String slug, String title, String description, List<String> categories, String body, String projectType, int downloads, String iconUrl, String id, String team, Date published, Date updated, List<String> versions) {
public Project(String slug, String title, String description, List<String> categories, String body, String projectType, int downloads, String iconUrl, String id, String team, Instant published, Instant updated, List<String> versions) {
this.slug = slug;
this.title = title;
this.description = description;
@ -276,11 +277,11 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
return team;
}
public Date getPublished() {
public Instant getPublished() {
return published;
}
public Date getUpdated() {
public Instant getUpdated() {
return updated;
}
@ -384,7 +385,7 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
private final String authorId;
@SerializedName("date_published")
private final Date datePublished;
private final Instant datePublished;
private final int downloads;
@ -393,7 +394,7 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
private final List<ProjectVersionFile> files;
public ProjectVersion(String name, String versionNumber, String changelog, List<Dependency> dependencies, List<String> gameVersions, String versionType, List<String> loaders, boolean featured, String id, String projectId, String authorId, Date datePublished, int downloads, String changelogUrl, List<ProjectVersionFile> files) {
public ProjectVersion(String name, String versionNumber, String changelog, List<Dependency> dependencies, List<String> gameVersions, String versionType, List<String> loaders, boolean featured, String id, String projectId, String authorId, Instant datePublished, int downloads, String changelogUrl, List<ProjectVersionFile> files) {
this.name = name;
this.versionNumber = versionNumber;
this.changelog = changelog;
@ -455,7 +456,7 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
return authorId;
}
public Date getDatePublished() {
public Instant getDatePublished() {
return datePublished;
}
@ -590,15 +591,15 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
private final List<String> versions;
@SerializedName("date_created")
private final Date dateCreated;
private final Instant dateCreated;
@SerializedName("date_modified")
private final Date dateModified;
private final Instant dateModified;
@SerializedName("latest_version")
private final String latestVersion;
public ProjectSearchResult(String slug, String title, String description, List<String> categories, String projectType, int downloads, String iconUrl, String projectId, String author, List<String> versions, Date dateCreated, Date dateModified, String latestVersion) {
public ProjectSearchResult(String slug, String title, String description, List<String> categories, String projectType, int downloads, String iconUrl, String projectId, String author, List<String> versions, Instant dateCreated, Instant dateModified, String latestVersion) {
this.slug = slug;
this.title = title;
this.description = description;
@ -654,11 +655,11 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
return versions;
}
public Date getDateCreated() {
public Instant getDateCreated() {
return dateCreated;
}
public Date getDateModified() {
public Instant getDateModified() {
return dateModified;
}

70
FCLCore/src/main/java/com/tungsten/fclcore/util/Logging.java
View File

@ -19,14 +19,13 @@ package com.tungsten.fclcore.util;
import com.tungsten.fclcore.util.io.IOUtils;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.MessageFormat;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.Date;
import java.util.logging.*;
public final class Logging {
@ -57,10 +56,11 @@ public final class Logging {
LOG.setLevel(Level.ALL);
LOG.setUseParentHandlers(false);
LOG.setFilter(record -> {
record.setMessage(filterForbiddenToken(record.getMessage()));
record.setMessage(format(record));
return true;
});
DefaultFormatter formatter = new DefaultFormatter();
try {
if (Files.isRegularFile(logFolder))
Files.delete(logFolder);
@ -68,7 +68,7 @@ public final class Logging {
Files.createDirectories(logFolder);
FileHandler fileHandler = new FileHandler(logFolder.resolve("fcl.log").toAbsolutePath().toString());
fileHandler.setLevel(Level.FINEST);
fileHandler.setFormatter(DefaultFormatter.INSTANCE);
fileHandler.setFormatter(formatter);
fileHandler.setEncoding("UTF-8");
LOG.addHandler(fileHandler);
} catch (IOException e) {
@ -76,11 +76,11 @@ public final class Logging {
}
ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setFormatter(DefaultFormatter.INSTANCE);
consoleHandler.setFormatter(formatter);
consoleHandler.setLevel(Level.FINER);
LOG.addHandler(consoleHandler);
StreamHandler streamHandler = new StreamHandler(storedLogs, DefaultFormatter.INSTANCE) {
StreamHandler streamHandler = new StreamHandler(storedLogs, formatter) {
@Override
public synchronized void publish(LogRecord record) {
super.publish(record);
@ -101,7 +101,7 @@ public final class Logging {
LOG.setUseParentHandlers(false);
ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setFormatter(DefaultFormatter.INSTANCE);
consoleHandler.setFormatter(new DefaultFormatter());
consoleHandler.setLevel(Level.FINER);
LOG.addHandler(consoleHandler);
}
@ -118,23 +118,45 @@ public final class Logging {
}
}
private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss").withZone(ZoneId.systemDefault());
private static String format(LogRecord record) {
String message = filterForbiddenToken(record.getMessage());
StringBuilder builder = new StringBuilder(128 + message.length());
builder.append('[');
TIME_FORMATTER.formatTo(Instant.ofEpochMilli(record.getMillis()), builder);
builder.append(']');
builder.append(" [")
.append(record.getSourceClassName())
.append('.')
.append(record.getSourceMethodName())
.append('/')
.append(record.getLevel().getName())
.append("] ")
.append(message)
.append('\n');
Throwable thrown = record.getThrown();
if (thrown == null) {
return builder.toString();
} else {
StringWriter writer = new StringWriter(builder.length() + 2048);
writer.getBuffer().append(builder);
try (PrintWriter printWriter = new PrintWriter(writer)) {
thrown.printStackTrace(printWriter);
}
return writer.toString();
}
}
private static final class DefaultFormatter extends Formatter {
static final DefaultFormatter INSTANCE = new DefaultFormatter();
private static final MessageFormat format = new MessageFormat("[{0,date,HH:mm:ss}] [{1}.{2}/{3}] {4}\n");
@Override
public String format(LogRecord record) {
String log = format.format(new Object[]{
new Date(record.getMillis()),
record.getSourceClassName(), record.getSourceMethodName(), record.getLevel().getName(),
record.getMessage()
}, new StringBuffer(128), null).toString();
if (record.getThrown() != null)
log += StringUtils.getStackTrace(record.getThrown());
return log;
return record.getMessage();
}
}
}

102
FCLCore/src/main/java/com/tungsten/fclcore/util/gson/DateTypeAdapter.java
View File

@ -1,102 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2020 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.tungsten.fclcore.util.gson;
import com.google.gson.*;
import java.lang.reflect.Type;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.util.Date;
import java.util.Locale;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
public final class DateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
public static final DateTypeAdapter INSTANCE = new DateTypeAdapter();
private DateTypeAdapter() {
}
@Override
public JsonElement serialize(Date t, Type type, JsonSerializationContext jsc) {
synchronized (EN_US_FORMAT) {
return new JsonPrimitive(serializeToString(t));
}
}
@Override
public Date deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException {
if (!(json instanceof JsonPrimitive))
throw new JsonParseException("The date should be a string value");
else {
Date date = deserializeToDate(json.getAsString());
if (type == Date.class)
return date;
else
throw new IllegalArgumentException(this.getClass().toString() + " cannot be deserialized to " + type);
}
}
public static final DateFormat EN_US_FORMAT = DateFormat.getDateTimeInstance(2, 2, Locale.US);
public static final DateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
public static final DateTimeFormatter ISO_DATE_TIME = new DateTimeFormatterBuilder()
.append(ISO_LOCAL_DATE_TIME)
.optionalStart().appendOffset("+HH:MM", "+00:00").optionalEnd()
.optionalStart().appendOffset("+HHMM", "+0000").optionalEnd()
.optionalStart().appendOffset("+HH", "Z").optionalEnd()
.optionalStart().appendOffsetId().optionalEnd()
.toFormatter();
public static Date deserializeToDate(String string) {
synchronized (EN_US_FORMAT) {
try {
return EN_US_FORMAT.parse(string);
} catch (ParseException ex1) {
try {
ZonedDateTime zonedDateTime = ZonedDateTime.parse(string, ISO_DATE_TIME);
return Date.from(zonedDateTime.toInstant());
} catch (DateTimeParseException e) {
try {
LocalDateTime localDateTime = LocalDateTime.parse(string, ISO_LOCAL_DATE_TIME);
return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
} catch (DateTimeParseException e2) {
throw new JsonParseException("Invalid date: " + string, e);
}
}
}
}
}
public static String serializeToString(Date date) {
synchronized (EN_US_FORMAT) {
String result = ISO_8601_FORMAT.format(date);
return result.substring(0, 22) + ":" + result.substring(22);
}
}
}

66
FCLCore/src/main/java/com/tungsten/fclcore/util/gson/InstantTypeAdapter.java
View File

@ -1,6 +1,6 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2020 huangyuhui <huanghongxun2008@126.com> and contributors
* Copyright (C) 2021 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,9 +20,15 @@ package com.tungsten.fclcore.util.gson;
import com.google.gson.*;
import java.lang.reflect.Type;
import java.time.Instant;
import java.time.ZoneId;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.time.format.FormatStyle;
import java.time.temporal.ChronoUnit;
import java.util.Locale;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
public final class InstantTypeAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
public static final InstantTypeAdapter INSTANCE = new InstantTypeAdapter();
@ -31,21 +37,53 @@ public final class InstantTypeAdapter implements JsonSerializer<Instant>, JsonDe
}
@Override
public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
if (!(json instanceof JsonPrimitive)) {
public JsonElement serialize(Instant t, Type type, JsonSerializationContext jsc) {
return new JsonPrimitive(serializeToString(t, ZoneId.systemDefault()));
}
@Override
public Instant deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException {
if (!(json instanceof JsonPrimitive))
throw new JsonParseException("The instant should be a string value");
} else {
Instant instant = Instant.parse(json.getAsString());
if (typeOfT == Instant.class) {
return instant;
} else {
throw new IllegalArgumentException(this.getClass() + " cannot be deserialized to " + typeOfT);
else {
Instant time = deserializeToInstant(json.getAsString());
if (type == Instant.class)
return time;
else
throw new IllegalArgumentException(this.getClass() + " cannot be deserialized to " + type);
}
}
private static final DateTimeFormatter EN_US_FORMAT = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.MEDIUM)
.withLocale(Locale.US)
.withZone(ZoneId.systemDefault());
private static final DateTimeFormatter ISO_DATE_TIME = new DateTimeFormatterBuilder()
.append(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
.optionalStart().appendOffset("+HH:MM", "+00:00").optionalEnd()
.optionalStart().appendOffset("+HHMM", "+0000").optionalEnd()
.optionalStart().appendOffset("+HH", "Z").optionalEnd()
.optionalStart().appendOffsetId().optionalEnd()
.toFormatter();
public static Instant deserializeToInstant(String string) {
try {
return ZonedDateTime.parse(string, EN_US_FORMAT).toInstant();
} catch (DateTimeParseException ex1) {
try {
ZonedDateTime zonedDateTime = ZonedDateTime.parse(string, ISO_DATE_TIME);
return zonedDateTime.toInstant();
} catch (DateTimeParseException e) {
try {
LocalDateTime localDateTime = LocalDateTime.parse(string, ISO_LOCAL_DATE_TIME);
return localDateTime.atZone(ZoneId.systemDefault()).toInstant();
} catch (DateTimeParseException e2) {
throw new JsonParseException("Invalid instant: " + string, e);
}
}
}
}
@Override
public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
return new JsonPrimitive(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneId.systemDefault()).format(src));
public static String serializeToString(Instant instant, ZoneId zone) {
return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.ofInstant(instant, zone).truncatedTo(ChronoUnit.SECONDS));
}
}

1
FCLCore/src/main/java/com/tungsten/fclcore/util/gson/JsonUtils.java
View File

@ -110,7 +110,6 @@ public final class JsonUtils {
.enableComplexMapKeySerialization()
.setPrettyPrinting()
.registerTypeAdapter(Instant.class, InstantTypeAdapter.INSTANCE)
.registerTypeAdapter(Date.class, DateTypeAdapter.INSTANCE)
.registerTypeAdapter(UUID.class, UUIDTypeAdapter.INSTANCE)
.registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
.registerTypeAdapterFactory(ValidationTypeAdapterFactory.INSTANCE)

2
FCLLibrary/src/main/java/com/tungsten/fcllibrary/crash/CrashReporter.java
View File

@ -17,8 +17,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import com.tungsten.fcllibrary.R;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;