-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #488 from Shynixn/development
Merge changes to master --release
- Loading branch information
Showing
176 changed files
with
1,682 additions
and
4,806 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,8 @@ | ||
dependencies { | ||
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9") | ||
implementation("com.github.shynixn.mcutils:common:1.0.41") | ||
} | ||
|
||
repositories { | ||
maven("https://shynixn.github.io/m2/repository/mcutils") | ||
} |
213 changes: 0 additions & 213 deletions
213
...ball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/ChatColor.kt
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
.../java/com/github/shynixn/blockball/api/business/enumeration/CompatibilityArmorSlotType.kt
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
...i/src/main/java/com/github/shynixn/blockball/api/business/enumeration/EffectTargetType.kt
This file was deleted.
Oops, something went wrong.
57 changes: 0 additions & 57 deletions
57
...all-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/EntityType.kt
This file was deleted.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
...ball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/GameState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.github.shynixn.blockball.api.business.enumeration | ||
|
||
enum class GameState { | ||
/** | ||
* State when the game is running. | ||
*/ | ||
RUNNING, | ||
/** | ||
* State when the game is disabled. | ||
*/ | ||
DISABLED, | ||
/** | ||
* State when the game is enabled but not running. | ||
*/ | ||
JOINABLE | ||
} |
Oops, something went wrong.