diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffingesJson.java | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt index a0b6e91d8..4f9c1b799 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt @@ -69,7 +69,9 @@ object TimeUtils { } // TODO: use kotlin Duration - fun getMillis(string: String) = pattern.matchMatcher(string.lowercase().trim()) { + fun getMillis(string: String) = getMillis_(string.replace("m", "m ").replace(" ", " ")) + + private fun getMillis_(string: String) = pattern.matchMatcher(string.lowercase().trim()) { val years = group("y")?.toLong() ?: 0L val days = group("d")?.toLong() ?: 0L val hours = group("h")?.toLong() ?: 0L @@ -83,7 +85,7 @@ object TimeUtils { millis += days * 24 * 60 * 60 * 1000 millis += (years * 365.25 * 24 * 60 * 60 * 1000).toLong() - millis + millis } ?: tryAlternativeFormat(string) private fun tryAlternativeFormat(string: String): Long { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffingesJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffingesJson.java new file mode 100644 index 000000000..47c10c2c9 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffingesJson.java @@ -0,0 +1,11 @@ +package at.hannibal2.skyhanni.utils.jsonobjects; + +import at.hannibal2.skyhanni.utils.LorenzVec; +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class RiftEffingesJson { + @Expose + public List<LorenzVec> locations; +} |
