From 19632ac1623db06328110641da13f20f4c97016b Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 22 Sep 2018 12:33:18 +0800
Subject: [PATCH] Move JsonUtils->gson, JarUtils->io, Properties->javafx

---
 HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java           | 2 +-
 .../main/java/org/jackhuang/hmcl/game/HMCLModpackManager.java | 2 +-
 .../java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java     | 2 +-
 .../main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java   | 2 +-
 .../main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java   | 2 +-
 .../hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java  | 2 +-
 .../hmcl/auth/authlibinjector/AuthlibInjectorServer.java      | 3 ++-
 .../src/main/java/org/jackhuang/hmcl/mod/CurseManifest.java   | 2 +-
 HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java   | 1 +
 .../src/main/java/org/jackhuang/hmcl/mod/MultiMCManifest.java | 2 +-
 .../src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java | 2 +-
 HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java      | 1 +
 .../java/org/jackhuang/hmcl/util/{ => gson}/JsonUtils.java    | 4 +++-
 .../main/java/org/jackhuang/hmcl/util/{ => io}/JarUtils.java  | 2 +-
 .../java/org/jackhuang/hmcl/util/{ => javafx}/Properties.java | 4 +++-
 15 files changed, 20 insertions(+), 13 deletions(-)
 rename HMCLCore/src/main/java/org/jackhuang/hmcl/util/{ => gson}/JsonUtils.java (93%)
 rename HMCLCore/src/main/java/org/jackhuang/hmcl/util/{ => io}/JarUtils.java (98%)
 rename HMCLCore/src/main/java/org/jackhuang/hmcl/util/{ => javafx}/Properties.java (93%)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java
index 902cca129..9f819bd48 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java
@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl;
 
-import org.jackhuang.hmcl.util.JarUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
 
 /**
  * Stores metadata about this application.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackManager.java
index e4d9142b8..2d4ba4aaf 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackManager.java
@@ -19,9 +19,9 @@ package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.util.JsonUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 
 import java.io.File;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java
index 29ae6021e..c2ed66dd1 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java
@@ -18,8 +18,8 @@
 package org.jackhuang.hmcl.upgrade;
 
 import org.jackhuang.hmcl.util.DigestUtils;
-import org.jackhuang.hmcl.util.JarUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java
index 8e18cb3c6..febcf48a2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java
@@ -21,7 +21,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
-import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.IOException;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java
index a8cf44c14..0508081aa 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java
@@ -28,8 +28,8 @@ import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.util.JarUtils;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 
 import javax.swing.*;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java
index fe909c109..f2f0c539e 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java
@@ -22,7 +22,7 @@ import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
-import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.IOException;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
index 58f84bd44..015c4b00b 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
@@ -20,7 +20,8 @@ package org.jackhuang.hmcl.auth.authlibinjector;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
-import org.jackhuang.hmcl.util.JsonUtils;
+
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.IOException;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseManifest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseManifest.java
index 9dc6b0009..96414a306 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseManifest.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/CurseManifest.java
@@ -21,7 +21,7 @@ import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 
 import org.jackhuang.hmcl.util.Immutable;
-import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 
 import java.io.File;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java
index 74c008089..9f7d4a33f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java
@@ -8,6 +8,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCManifest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCManifest.java
index 7266fa832..156b8cd4b 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCManifest.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCManifest.java
@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.mod;
 import com.google.gson.annotations.SerializedName;
 
 import org.jackhuang.hmcl.util.Immutable;
-import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java
index 5f887d7b1..d17fc72cd 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java
@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.mod;
 import com.google.gson.JsonParseException;
 
 import org.jackhuang.hmcl.util.Immutable;
-import org.jackhuang.hmcl.util.JsonUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java
index e7be4574b..e717a1ffa 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java
@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.function.ExceptionalConsumer;
 import org.jackhuang.hmcl.util.function.ExceptionalFunction;
 import org.jackhuang.hmcl.util.function.ExceptionalRunnable;
+import org.jackhuang.hmcl.util.javafx.Properties;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JsonUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonUtils.java
similarity index 93%
rename from HMCLCore/src/main/java/org/jackhuang/hmcl/util/JsonUtils.java
rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonUtils.java
index 9ff421ddc..54a0a0ad5 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JsonUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonUtils.java
@@ -15,7 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.util;
+package org.jackhuang.hmcl.util.gson;
+
+import org.jackhuang.hmcl.util.Constants;
 
 import com.google.gson.JsonParseException;
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JarUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java
similarity index 98%
rename from HMCLCore/src/main/java/org/jackhuang/hmcl/util/JarUtils.java
rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java
index f26f8f75f..912d0896f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JarUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.util;
+package org.jackhuang.hmcl.util.io;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Properties.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/javafx/Properties.java
similarity index 93%
rename from HMCLCore/src/main/java/org/jackhuang/hmcl/util/Properties.java
rename to HMCLCore/src/main/java/org/jackhuang/hmcl/util/javafx/Properties.java
index 44bc547bc..ee94d8b17 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Properties.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/javafx/Properties.java
@@ -15,12 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hmcl.util;
+package org.jackhuang.hmcl.util.javafx;
 
 import javafx.beans.property.Property;
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.jackhuang.hmcl.util.Constants;
+
 /**
  *
  * @author huangyuhui