Skip to content

Commit

Permalink
Move data objects to their appropriate packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Deftu committed Sep 14, 2024
1 parent a1557a7 commit 70c0f8a
Show file tree
Hide file tree
Showing 21 changed files with 19 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/one/devos/osuv2kt/models/Scope.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package one.devos.osuv2kt.models

public enum class Scope(public val value: String) {
public enum class Scope(private val value: String) {

READ_CHAT("chat.read"),
WRITE_CHAT("chat.write"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.beatmap

public data class Availability(
public val downloadDisabled: Boolean,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package one.devos.osuv2kt.models.beatmap

import one.devos.osuv2kt.models.Failtimes
import one.devos.osuv2kt.models.RankStatus
import one.devos.osuv2kt.models.Ruleset
import java.time.OffsetDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package one.devos.osuv2kt.models.beatmap

import one.devos.osuv2kt.models.Availability
import one.devos.osuv2kt.models.Hype
import one.devos.osuv2kt.models.Nomination
import one.devos.osuv2kt.models.NominationsSummary
import java.time.OffsetDateTime

public data class Beatmapset(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.beatmap

public data class Failtimes(
val exit: IntArray?,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.beatmap

public data class Hype(
public val current: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.beatmap

import one.devos.osuv2kt.models.Ruleset

public data class Nomination(
val beatmapsetId: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.beatmap

public data class NominationsSummary(
public val current: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.score

public enum class MultiplayerScoresAround {
HIGHER,
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/one/devos/osuv2kt/models/score/Score.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package one.devos.osuv2kt.models.score

import one.devos.osuv2kt.models.MultiplayerScoresAround
import java.time.OffsetDateTime

public data class Score(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

public data class GradeCounts(
val a: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

public data class Kudosu(
public val available: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

public data class Level(
public val current: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

import java.time.OffsetDateTime

Expand Down
4 changes: 1 addition & 3 deletions src/main/kotlin/one/devos/osuv2kt/models/user/User.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package one.devos.osuv2kt.models.user

import com.google.gson.JsonObject
import one.devos.osuv2kt.models.*
import java.awt.Color
import java.time.OffsetDateTime
Expand All @@ -26,8 +25,7 @@ public data class User(

// Optionals
public val accountHistory: Array<UserAccountHistory>?,
// TODO: activeTournamentBanners
val activeTournamentBanners: Array<ProfileBanner>?,
public val activeTournamentBanners: Array<ProfileBanner>?,
public val badges: Array<UserBadge>?,
public val beatmapPlaycountsCount: Int?,
public val blocks: Any?,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

import java.time.OffsetDateTime

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

public enum class UserAccountHistoryType() {
NOTE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

import com.google.gson.annotations.SerializedName
import java.time.OffsetDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.devos.osuv2kt.models
package one.devos.osuv2kt.models.user

public data class UserGroup(
public val playmodes: Array<String>? = null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package one.devos.osuv2kt.models.user

import one.devos.osuv2kt.models.GradeCounts
import one.devos.osuv2kt.models.Level

public data class UserStatistics(
public val count100: Int,
public val count300: Int,
Expand Down

0 comments on commit 70c0f8a

Please sign in to comment.