Move JsonUtils->gson, JarUtils->io, Properties->javafx

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;

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;

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;

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;

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;
 

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;
 

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;

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;
 

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;

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