refactor: #78 and #79

.gitignore

@@ -23,6 +23,7 @@ test*/
 
 # Exclude runtime files
 /ArkPetsConfig.json
+/models_data.json
 /assets/models
 /assets/logs
 /assets/ArkPetsConfig.json

assets/ArkPetsConfigDefault.json

@@ -1,10 +1,10 @@
 {
-    "background_color":"#00000000",
     "behavior_ai_activation":8,
     "behavior_allow_interact":true,
     "behavior_allow_sit":true,
     "behavior_allow_walk":true,
     "behavior_do_peer_repulsion":true,
+    "canvas_color":"#00000000",
     "canvas_fitting_samples":16,
     "character_asset":"",
     "character_files":{},

assets/UI/SettingsModule.fxml

@@ -37,7 +37,7 @@
                 </HBox>
                 <HBox>
                     <Label text="背景颜色"/>
-                    <JFXComboBox fx:id="configBackgroundColor" prefWidth="120.0"/>
+                    <JFXComboBox fx:id="configCanvasColor" prefWidth="120.0"/>
                 </HBox>
                 <Separator/>
                 <Label styleClass="config-group-title" text="高级设置"/>

core/src/cn/harryh/arkpets/ArkChar.java

@@ -64,7 +64,6 @@ public ArkChar(ArkConfig config, float scale) {
         camera.setMinInsert(canvasReserveLength - canvasMaxSize);
         batch = new TwoColorPolygonBatch();
         renderer = new SkeletonRenderer();
-        Color backgroundColor = config.getBackgroundColor();
         /* Pre-multiplied alpha shouldn't be applied to models released in Arknights 2.1.41 or later,
         otherwise you may get a corrupted rendering result. */
         renderer.setPremultipliedAlpha(false);
@@ -123,7 +122,7 @@ protected void onApply(AnimData playing) {
             }
         };
         // 6.Canvas setup
-        setCanvas(backgroundColor);
+        setCanvas(config.getCanvasColor());
         stageInsertMap = new HashMap<>();
         for (AnimStage stage : animList.clusterByStage().keySet()) {
             // Figure out the suitable canvas size

core/src/cn/harryh/arkpets/ArkConfig.java

@@ -39,8 +39,6 @@ public class ArkConfig implements Serializable {
 
 
     // Config items and default values:
-    /** @since ArkPets 3.3 */ @JSONField(defaultValue = "#00000000")
-    public String       background_color;
     /** @since ArkPets 1.0 */ @JSONField(defaultValue = "8")
     public int          behavior_ai_activation;
     /** @since ArkPets 1.0 */ @JSONField(defaultValue = "true")
@@ -51,6 +49,8 @@ public class ArkConfig implements Serializable {
     public boolean      behavior_allow_walk;
     /** @since ArkPets 1.6 */ @JSONField(defaultValue = "true")
     public boolean      behavior_do_peer_repulsion;
+    /** @since ArkPets 3.3 */ @JSONField(defaultValue = "#00000000")
+    public String       canvas_color;
     /** @since ArkPets 3.1 */ @JSONField(defaultValue = "16")
     public int          canvas_fitting_samples;
     /** @since ArkPets 2.0 */ @JSONField()
@@ -114,18 +114,19 @@ public boolean isNewcomer() {
         return isNewcomer;
     }
 
-    /** Returns converted background color.
+    /** Returns the background color of the canvas.
+     * @see com.badlogic.gdx.graphics.Color
      */
     @JSONField(serialize = false)
-    public Color getBackgroundColor() {
-        Color backgroundColor;
-        if (background_color.matches("^#[0-9a-fA-F]{8}$")) {
-            backgroundColor = Color.valueOf(background_color);
+    public Color getCanvasColor() {
+        Color color;
+        if (hexColorRegex.matcher(canvas_color).matches()) {
+            color = Color.valueOf(canvas_color);
         } else {
-            Logger.warn("System", "Invalid background color,using transparent");
-            backgroundColor = Color.CLEAR;
+            Logger.warn("Config", "Invalid color config, using transparent");
+            color = Color.CLEAR;
         }
-        return backgroundColor;
+        return color;
     }
 
     /** Gets the custom ArkConfig object by reading the external config file.

core/src/cn/harryh/arkpets/ArkPets.java

@@ -62,8 +62,8 @@ public void create() {
 		config = Objects.requireNonNull(ArkConfig.getConfig(), "ArkConfig returns a null instance, please check the config file.");
 		Gdx.input.setInputProcessor(this);
 		Gdx.graphics.setForegroundFPS(config.display_fps);
-		Logger.info("System", "OpenGL Version " + Gdx.gl.glGetString(GL20.GL_VERSION));
-		Logger.info("System", "OpenGL Vendor " + Gdx.gl.glGetString(GL20.GL_VENDOR));
+		Logger.debug("App", "OpenGL version is " + Gdx.gl.glGetString(GL20.GL_VERSION));
+		Logger.debug("App", "OpenGL vendor is " + Gdx.gl.glGetString(GL20.GL_VENDOR));
 
 		// 2.Character setup
 		Logger.info("App", "Using model asset \"" + config.character_asset + "\"");

core/src/cn/harryh/arkpets/Const.java

@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Objects;
+import java.util.regex.Pattern;
 
 
 /** Constants definition class.
@@ -78,8 +79,10 @@ public final class Const {
     public static final int reconnectDelayMillis    = 5 * 1000;
 
     // Misc constants
-    public static String ipPortRegex = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?):\\d{1,5}$";
-
+    public static final Pattern ipPortRegex     = Pattern.compile(
+            "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?):\\d{1,5}$");
+    public static final Pattern hexColorRegex   = Pattern.compile(
+            "^#([0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$");
 
     /** Paths presets definition class.
      */

core/src/cn/harryh/arkpets/concurrent/PortUtils.java

@@ -37,8 +37,9 @@ public static int getServerPort(int[] expectedPorts)
                 if (socketData.operation == SocketData.Operation.HANDSHAKE_RESPONSE)
                     return serverPort;
             } catch (JSONException ignored) {
-                Logger.error("SocketServer", String.format("Port %d is already occupied and is not occupied by ArkPets", serverPort));
+                Logger.warn("SocketServer", "Port " + serverPort + " responded with an invalid content");
             } catch (IOException ignored) {
+                Logger.warn("SocketServer", "Port " + serverPort + " is inaccessible");
             }
         }
         throw new NoServerRunningException();
@@ -67,20 +68,26 @@ public static int getAvailablePort(int[] expectedPorts)
     }
 
 
+    /** This exception indicates that there is no port in idle.
+     */
     public static class NoPortAvailableException extends IllegalStateException {
         public NoPortAvailableException() {
             super("No port is available.");
         }
     }
 
 
+    /** This exception indicates that a server is already running.
+     */
     public static class ServerCollisionException extends IllegalStateException {
         public ServerCollisionException() {
             super("A server is already running.");
         }
     }
 
 
+    /** This exception indicates that no running server is found.
+     */
     public static class NoServerRunningException extends IllegalStateException {
         public NoServerRunningException() {
             super("No running server is found.");

desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java

@@ -8,6 +8,7 @@
 import cn.harryh.arkpets.utils.Logger;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import com.badlogic.gdx.graphics.Color;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWErrorCallback;
 import org.lwjgl.system.MemoryUtil;
@@ -74,7 +75,7 @@ protected void process(String command, String addition) {
             // Configure window display
             config.setInitialVisible(true);
             config.setTransparentFramebuffer(true);
-            config.setInitialBackgroundColor(appConfig.getBackgroundColor());
+            config.setInitialBackgroundColor(Color.CLEAR);
             // Handle GLFW error
             GLFW.glfwSetErrorCallback(new GLFWErrorCallback() {
                 @Override

desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java

@@ -41,7 +41,7 @@ public final class SettingsModule implements Controller<ArkHomeFX> {
     @FXML
     private JFXComboBox<NamedItem<Integer>> configRenderOutline;
     @FXML
-    private JFXComboBox<NamedItem<Integer>> configBackgroundColor;
+    private JFXComboBox<NamedItem<Integer>> configCanvasColor;
     @FXML
     private JFXCheckBox configWindowTopmost;
     @FXML
@@ -143,13 +143,13 @@ public String getContent() {
                     app.config.display_render_outline = newValue.value();
                     app.config.save();
                 });
-        new ComboBoxSetup<>(configBackgroundColor).setItems(new NamedItem<>("透明", 0x00000000),
-                        new NamedItem<>("绿色", 0x00ff00ff),
-                        new NamedItem<>("蓝色", 0x0000ffff),
-                        new NamedItem<>("品红色", 0xff00ffff))
-                .selectValue(Color.rgba8888(app.config.getBackgroundColor()), app.config.background_color + "（自定义）")
+        new ComboBoxSetup<>(configCanvasColor).setItems(new NamedItem<>("透明", 0x00000000),
+                        new NamedItem<>("绿色", 0x00FF00FF),
+                        new NamedItem<>("蓝色", 0x0000FFFF),
+                        new NamedItem<>("品红色", 0xFF00FFFF))
+                .selectValue(Color.rgba8888(app.config.getCanvasColor()), app.config.canvas_color + "（自定义）")
                 .setOnNonNullValueUpdated((observable, oldValue, newValue) -> {
-                    app.config.background_color = String.format("#%08X", newValue.value());
+                    app.config.canvas_color = String.format("#%08X", newValue.value());
                     app.config.save();
                 });
         configWindowTopmost.setSelected(app.config.window_style_topmost);
@@ -201,7 +201,7 @@ else if (args.contains(Const.LogConfig.debugArg))
                 System.setProperty("https.proxyHost", "");
                 System.setProperty("https.proxyPort", "");
             } else {
-                if (newValue.matches(ipPortRegex)) {
+                if (ipPortRegex.matcher(newValue).matches()) {
                     String[] ipPort = newValue.split(":");
                     System.setProperty("http.proxyHost", ipPort[0]);
                     System.setProperty("http.proxyPort", ipPort[1]);