Updated version to 1.0.1

Updated justice-utils to 1.3.4
DrCorchit · Nov 11, 2023 · 97e26f4 · 97e26f4
1 parent 7d6341e
commit 97e26f4
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 33 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>justice-core</artifactId>
     <groupId>com.drcorchit</groupId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <name>justice-core</name>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.github.DrCorchit</groupId>
             <artifactId>justice-utils</artifactId>
-            <version>1.2.1</version>
+            <version>1.3.4</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/src/main/kotlin/com/drcorchit/justice/games/AbstractElement.kt b/src/main/kotlin/com/drcorchit/justice/games/AbstractElement.kt
@@ -1,6 +1,6 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.json.getString
+import com.drcorchit.justice.utils.json.getString
 import com.google.gson.JsonObject
 
 abstract class AbstractElement(private val parent: AbstractMechanic<*>, name: String, private val id: Int) : GameElement {

diff --git a/src/main/kotlin/com/drcorchit/justice/games/AbstractMechanic.kt b/src/main/kotlin/com/drcorchit/justice/games/AbstractMechanic.kt
@@ -1,7 +1,7 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.Logger
-import com.drcorchit.utils.json.getOrDefault
+import com.drcorchit.justice.utils.Logger
+import com.drcorchit.justice.utils.json.getOrDefault
 import com.google.gson.JsonObject
 
 private val log = Logger.getLogger(AbstractMechanic::class.java)

diff --git a/src/main/kotlin/com/drcorchit/justice/games/Game.kt b/src/main/kotlin/com/drcorchit/justice/games/Game.kt
@@ -1,8 +1,9 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.Version
-import com.drcorchit.utils.json.*
-import com.drcorchit.utils.math.Rng
+import com.drcorchit.justice.utils.Version
+import com.drcorchit.justice.utils.json.*
+import com.drcorchit.justice.utils.json.Result.Companion.failWithReason
+import com.drcorchit.justice.utils.math.Rng
 import com.google.errorprone.annotations.CanIgnoreReturnValue
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject

diff --git a/src/main/kotlin/com/drcorchit/justice/games/GameElement.kt b/src/main/kotlin/com/drcorchit/justice/games/GameElement.kt
@@ -1,7 +1,7 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.json.GSON
-import com.drcorchit.utils.normalize
+import com.drcorchit.justice.utils.Strings.Companion.normalize
+import com.drcorchit.justice.utils.json.JsonUtils.Companion.GSON
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 
@@ -15,7 +15,7 @@ interface GameElement : Syncable<JsonObject> {
     //Contract: The key is unique and does not change under any circumstances.
     //Contract: parent().getElement(key()).equals(this) is always true
     val key: Any
-        get() = normalize(name())
+        get() = name().normalize()
 
     //A short description of the object visible to the client
     fun description(): String

diff --git a/src/main/kotlin/com/drcorchit/justice/games/GameMechanic.kt b/src/main/kotlin/com/drcorchit/justice/games/GameMechanic.kt
@@ -1,6 +1,6 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.json.GSON
+import com.drcorchit.justice.utils.json.JsonUtils.Companion.GSON
 import com.google.gson.JsonObject
 
 interface GameMechanic<T : GameElement> : Syncable<JsonObject>, Iterable<T> {

diff --git a/src/main/kotlin/com/drcorchit/justice/games/GameState.kt b/src/main/kotlin/com/drcorchit/justice/games/GameState.kt
@@ -1,5 +1,7 @@
 package com.drcorchit.justice.games
 
+import com.google.gson.JsonElement
+
 enum class GameState(val isJoiningEnabled: Boolean, val isEventsEnabled: Boolean, val isSavingEnabled: Boolean) {
     //Transitions to "open" when minPlayers is reached
     STAGING(true, false, false),

diff --git a/src/main/kotlin/com/drcorchit/justice/games/GridElement.kt b/src/main/kotlin/com/drcorchit/justice/games/GridElement.kt
@@ -1,7 +1,7 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.json.getString
-import com.drcorchit.utils.math.Space
+import com.drcorchit.justice.utils.json.getString
+import com.drcorchit.justice.utils.math.Space
 import com.google.gson.JsonObject
 
 abstract class GridElement(val parent: GridMechanic<*>, val coord: Space.Coordinate) : GameElement {

diff --git a/src/main/kotlin/com/drcorchit/justice/games/GridMechanic.kt b/src/main/kotlin/com/drcorchit/justice/games/GridMechanic.kt
@@ -1,11 +1,11 @@
 package com.drcorchit.justice.games
 
-import com.drcorchit.utils.Logger
-import com.drcorchit.utils.json.getBool
-import com.drcorchit.utils.json.getOrDefault
-import com.drcorchit.utils.math.Grid
-import com.drcorchit.utils.math.Layout
-import com.drcorchit.utils.math.Space
+import com.drcorchit.justice.utils.Logger
+import com.drcorchit.justice.utils.json.getBool
+import com.drcorchit.justice.utils.json.getOrDefault
+import com.drcorchit.justice.utils.math.Grid
+import com.drcorchit.justice.utils.math.Layout
+import com.drcorchit.justice.utils.math.Space
 import com.google.gson.JsonObject
 
 private val log = Logger.getLogger(GridMechanic::class.java)
@@ -34,7 +34,7 @@ abstract class GridMechanic<T : GridElement>(game: Game, info: JsonObject, date:
 
     override fun get(key: Any): T {
         if (key is Space.Coordinate) {
-            return grid.get(key)
+            return grid.get(key)!!
         } else {
             throw IllegalArgumentException("Supplied key is not a valid coordinate")
         }

diff --git a/src/main/kotlin/com/drcorchit/justice/games/mods/Mod.kt b/src/main/kotlin/com/drcorchit/justice/games/mods/Mod.kt
@@ -1,11 +1,11 @@
 package com.drcorchit.justice.games.mods
 
-import com.drcorchit.utils.exceptions.MissingDependencyException
-import com.drcorchit.utils.json.JsonDiff
-import com.drcorchit.utils.json.getString
-import com.drcorchit.utils.json.parseFromUrl
-import com.drcorchit.utils.math.AcyclicGraph
-import com.drcorchit.utils.whitelist
+import com.drcorchit.justice.utils.Strings.Companion.whitelist
+import com.drcorchit.justice.utils.exceptions.MissingDependencyException
+import com.drcorchit.justice.utils.json.JsonDiff
+import com.drcorchit.justice.utils.json.JsonUtils.Companion.parseFromUrl
+import com.drcorchit.justice.utils.json.getString
+import com.drcorchit.justice.utils.math.AcyclicGraph
 import com.google.common.collect.ImmutableBiMap
 import com.google.common.collect.ImmutableMap
 import com.google.common.collect.ImmutableSet
@@ -42,6 +42,7 @@ class Mod private constructor(info: JsonObject) {
             "description",
             "No description is available for this mod"
         ).whitelist()
+
         author = info.get("author").asString.whitelist()
 
         reqMechanics = if (info.has("mechanics")) {

diff --git a/src/main/kotlin/com/drcorchit/justice/games/mods/ModID.kt b/src/main/kotlin/com/drcorchit/justice/games/mods/ModID.kt
@@ -1,10 +1,10 @@
 package com.drcorchit.justice.games.mods
 
-import com.drcorchit.utils.Version
-import com.drcorchit.utils.createCache
-import com.drcorchit.utils.json.parseFromUrl
-import com.drcorchit.utils.normalize
-import com.drcorchit.utils.whitelist
+import com.drcorchit.justice.utils.Strings.Companion.normalize
+import com.drcorchit.justice.utils.Strings.Companion.whitelist
+import com.drcorchit.justice.utils.Version
+import com.drcorchit.justice.utils.createCache
+import com.drcorchit.justice.utils.json.JsonUtils.Companion.parseFromUrl
 import com.google.common.cache.LoadingCache
 import com.google.gson.JsonObject
 import java.util.concurrent.ConcurrentHashMap
@@ -19,7 +19,7 @@ class ModID private constructor(pair: Pair<String, String>) {
 
     init {
         name = pair.first
-        normalName = normalize(name)
+        normalName = name.normalize()
         version = Version(pair.second)
         value = "${normalName}_v$version"
         val current: ModID? = LATEST_VERSIONS[normalName]