bump

Signed-off-by: Jian Chang <aa65535@live.com>
aa65535 · Mar 18, 2018 · 38e4560 · 38e4560
1 parent 1871719
commit 38e4560
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.aa65535.tabikaeruarchivemodifier"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 39
-        versionName "2.3.10"
+        versionCode 40
+        versionName "2.4.0"
     }
     signingConfigs {
         config {
@@ -43,6 +43,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation 'com.github.GrenderG:Toasty:1.2.8'
 }
diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/MainActivity.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/MainActivity.java
@@ -173,6 +173,7 @@ private void initData() {
                     gameData.reload(this);
                 }
             } catch (RuntimeException e) {
+                e.printStackTrace();
                 Toasty.error(this, e.getMessage()).show();
                 finish();
             }

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Clover.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Clover.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+@SuppressWarnings("unused")
 public class Clover extends Data<Void> {
     private int x;
     private int y;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Data.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Data.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+@SuppressWarnings("unused")
 abstract class Data<T> {
     final long offset;
     final int length;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/DataList.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/DataList.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
+@SuppressWarnings("unused")
 public class DataList<E extends Data> extends Data<ElementFactory<E>> implements Iterable<E> {
     private Int size;
     private List<E> data;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Event.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Event.java
@@ -7,6 +7,7 @@
 import java.io.RandomAccessFile;
 import java.util.Calendar;
 
+@SuppressWarnings("unused")
 public class Event extends Data<Void> {
     private int id;
     private int evtId;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/GameData.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/GameData.java
@@ -293,7 +293,7 @@ public float versionStart() {
     // getter end
 
     public boolean getAllItem(OnLoadedListener listener) {
-        int len = 0x21c - itemList.length();
+        int len = ALL_ITEMS_ARRAY.length * 8 + 4 - itemList.length();
         if (len > 0) {
             try {
                 expandData(itemList, len);

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Item.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Item.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+@SuppressWarnings("unused")
 public class Item extends Data<Void> {
     public static final int MAX_STOCK = 99;
 

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Mail.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/Mail.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+@SuppressWarnings("unused")
 public class Mail extends Data<Void> {
     private int id;
     private int mailId;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/PayData.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/model/PayData.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+@SuppressWarnings("unused")
 public class PayData extends Data<Void> {
     private int uid = -1;
     private Str recceptId;

diff --git a/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/utils/Constants.java b/app/src/main/java/com/aa65535/tabikaeruarchivemodifier/utils/Constants.java
@@ -4,19 +4,19 @@ public interface Constants {
     long ACHIEVE_FLAGS_BITS = 0x1fcf;
     int ACHIEVE_FLAGS_BITS_LEN = 13;
 
-    long COLLECT_FLAGS_BITS = 0x61ea6;
+    long COLLECT_FLAGS_BITS = 0x63fae;
     int COLLECT_FLAGS_BITS_LEN = 19;
 
-    long SPECIALTY_FLAGS_BITS = 0x7ffff61ea6L;
+    long SPECIALTY_FLAGS_BITS = 0x7ffff63faeL;
     int SPECIALTY_FLAGS_BITS_LEN = 39;
 
-    int[] ALL_ITEMS_ARRAY = new int[]{0x000063, 0x000163, 0x000263,
-            0x000363, 0x000463, 0x000563, 0x000663, 0x000763, 0x000863, 0x000963, 0x000a63,
-            0x000b63, 0x000c63, 0x000d63, 0x000e63, 0x03e863, 0x03e901, 0x03ea63, 0x03eb63,
-            0x03ec63, 0x03ed63, 0x03ee63, 0x03ef63, 0x03f063, 0x03f163, 0x03f263, 0x07d001,
-            0x07d101, 0x07d201, 0x07d301, 0x07d401, 0x07d501, 0x07d601, 0x07d701, 0x07d801,
-            0x07d901, 0x07da01, 0x07db01, 0x0bb963, 0x0bba63, 0x0bbd63, 0x0bbf63, 0x0bc163,
-            0x0bc263, 0x0bc363, 0x0bc463, 0x0bc963, 0x0bca63, 0x0bcc63, 0x0fa063, 0x0fa163,
+    int[] ALL_ITEMS_ARRAY = new int[]{0x000063, 0x000163, 0x000263, 0x000363, 0x000463, 0x000563,
+            0x000663, 0x000763, 0x000863, 0x000963, 0x000a63, 0x000b63, 0x000c63, 0x000d63,
+            0x000e63, 0x03e863, 0x03e901, 0x03ea63, 0x03eb63, 0x03ec63, 0x03ed63, 0x03ee63,
+            0x03ef63, 0x03f063, 0x03f163, 0x03f263, 0x07d001, 0x07d101, 0x07d201, 0x07d301,
+            0x07d401, 0x07d501, 0x07d601, 0x07d701, 0x07d801, 0x07d901, 0x07da01, 0x07db01,
+            0x0bb963, 0x0bba63, 0x0bbb63, 0x0bbd63, 0x0bbf63, 0x0bc063, 0x0bc163, 0x0bc263,
+            0x0bc363, 0x0bc463, 0x0bc563, 0x0bc963, 0x0bca63, 0x0bcc63, 0x0fa063, 0x0fa163,
             0x0fa263, 0x0fa363, 0x0fa463, 0x0fa563, 0x0fa663, 0x0fa763, 0x0fa863, 0x0fa963,
             0x0faa63, 0x0fab63, 0x0fac63, 0x0fad63, 0x0fae63, 0x0faf63, 0x0fb063, 0x0fb163};
 }