5.4 & fix auto update

Dituon · Mar 21, 2023 · ff02763 · ff02763
1 parent 1f6a640
commit ff02763
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ apply plugin: "java"
 
 
 group = 'xmmt.dituon'
-version = '5.4-M2'
+version = '5.4'
 
 repositories {
     maven { url 'https://maven.aliyun.com/repository/public' }

diff --git a/index.json b/index.json
@@ -1,5 +1,5 @@
 {
-    "version": 5.3,
+    "version": 5.4,
     "dataList": [
         "screen",
         "always",

diff --git a/src/main/java/moe/dituon/petpet/plugin/DataUpdater.java b/src/main/java/moe/dituon/petpet/plugin/DataUpdater.java
@@ -42,7 +42,7 @@ public void updateData() {
                 break;
             }
             short i = 0;
-            while (saveAs(targetDir.getPath() + pet, i + ".png")) i++;
+            while (saveAs(pet, i + ".png")) i++;
             System.out.println("PetData/" + pet + "下载成功 (length:" + i + ')');
         }
 
@@ -92,14 +92,13 @@ private String getUrlText(String url) {
             connection.disconnect();
             return str.toString();
         } catch (IOException ignored) {
-            System.out.println("无法连接到远程资源: " + url);
-            return null;
+            throw new RuntimeException("无法连接到远程资源: " + url);
         }
     }
 
     private boolean saveAs(String key, String fileName) {
         String url = getRepositoryFileUrl(key, fileName);
-        Path target = Paths.get(targetDir.getAbsolutePath(), fileName);
+        Path target = Paths.get(targetDir.getAbsolutePath() + '/' + key, fileName);
         try (InputStream ins = new URL(url).openStream()) {
             Files.createDirectories(target.getParent());
             Files.copy(ins, target, StandardCopyOption.REPLACE_EXISTING);