run ktlintFormat

MythicDrops · Jul 5, 2024 · aab9871 · aab9871
1 parent 814e3d3
commit aab9871
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 29 deletions.
diff --git a/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt b/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt
@@ -38,23 +38,31 @@ public object WorldGuardAdapter : IWorldGuardAdapter {
         WGBukkit.getPlugin().flagRegistry
     }
 
-    override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean =
-        getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true
+    override fun isFlagAllowAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true
 
-    override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean =
-        getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false
+    override fun isFlagDenyAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false
 
     override fun registerFlag(flagName: String) {
         flagRegistry.register(StateFlag(flagName, true))
     }
 
     private fun getRegionQuery() = regionContainer.createQuery()
 
-    private fun isFlagAllowAtLocation(location: Location, flag: StateFlag) =
-        getRegionQuery().testState(location, nullPlayer, flag)
+    private fun isFlagAllowAtLocation(
+        location: Location,
+        flag: StateFlag,
+    ) = getRegionQuery().testState(location, nullPlayer, flag)
 
-    private fun isFlagDenyAtLocation(location: Location, flag: StateFlag) =
-        !getRegionQuery().testState(location, nullPlayer, flag)
+    private fun isFlagDenyAtLocation(
+        location: Location,
+        flag: StateFlag,
+    ) = !getRegionQuery().testState(location, nullPlayer, flag)
 
     private fun getFlagFromRegistry(flagName: String): StateFlag? = flagRegistry.get(flagName) as? StateFlag
 }
diff --git a/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt b/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt
@@ -34,34 +34,43 @@ public object WorldGuardAdapter : IWorldGuardAdapter {
     // we had to change this due to WG 7.0.4 not always having a platform for some reason
     @Suppress("detekt.TooGenericExceptionCaught")
     private val worldGuardPlatform: WorldGuardPlatform?
-        get() = try {
-            WorldGuard.getInstance().platform
-        } catch (npe: NullPointerException) {
-            null
-        }
+        get() =
+            try {
+                WorldGuard.getInstance().platform
+            } catch (npe: NullPointerException) {
+                null
+            }
     private val regionContainer: RegionContainer?
         get() = worldGuardPlatform?.regionContainer
     private val flagRegistry: FlagRegistry by lazy {
         WorldGuard.getInstance().flagRegistry
     }
 
-    override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean =
-        getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true
+    override fun isFlagAllowAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true
 
-    override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean =
-        getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false
+    override fun isFlagDenyAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false
 
     override fun registerFlag(flagName: String) {
         flagRegistry.register(StateFlag(flagName, true))
     }
 
     private fun getRegionQuery() = regionContainer?.createQuery()
 
-    private fun isFlagAllowAtLocation(location: Location, flag: StateFlag) =
-        getRegionQuery()?.testState(BukkitAdapter.adapt(location), null, flag)
+    private fun isFlagAllowAtLocation(
+        location: Location,
+        flag: StateFlag,
+    ) = getRegionQuery()?.testState(BukkitAdapter.adapt(location), null, flag)
 
-    private fun isFlagDenyAtLocation(location: Location, flag: StateFlag) =
-        getRegionQuery()?.let { !it.testState(BukkitAdapter.adapt(location), null, flag) }
+    private fun isFlagDenyAtLocation(
+        location: Location,
+        flag: StateFlag,
+    ) = getRegionQuery()?.let { !it.testState(BukkitAdapter.adapt(location), null, flag) }
 
     private fun getFlagFromRegistry(flagName: String): StateFlag? = flagRegistry.get(flagName) as? StateFlag
 }
diff --git a/...i/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt b/...i/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt
@@ -35,7 +35,10 @@ public interface IWorldGuardAdapter {
      *
      * @return if flag is allow at location
      */
-    public fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean
+    public fun isFlagAllowAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean
 
     /**
      * Returns true if flag is deny at location.
@@ -45,7 +48,10 @@ public interface IWorldGuardAdapter {
      *
      * @return if flag is deny at location
      */
-    public fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean
+    public fun isFlagDenyAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean
 
     /**
      * Registers a flag with WorldGuard.

diff --git a/...ain/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt b/...ain/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt
@@ -29,10 +29,16 @@ import org.bukkit.Location
  */
 internal object NoOpWorldGuardAdapter : IWorldGuardAdapter {
     // do nothing, return true if no WorldGuard
-    override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean = true
+    override fun isFlagAllowAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = true
 
     // do nothing, return false if no WorldGuard
-    override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean = false
+    override fun isFlagDenyAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = false
 
     override fun registerFlag(flagName: String) {
         // do nothing, no op

diff --git a/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt b/...c/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt
@@ -47,11 +47,15 @@ public object WorldGuardAdapters : IWorldGuardAdapter {
         }
     }
 
-    override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean =
-        internalAdapter.isFlagAllowAtLocation(location, flagName)
+    override fun isFlagAllowAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = internalAdapter.isFlagAllowAtLocation(location, flagName)
 
-    override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean =
-        internalAdapter.isFlagDenyAtLocation(location, flagName)
+    override fun isFlagDenyAtLocation(
+        location: Location,
+        flagName: String,
+    ): Boolean = internalAdapter.isFlagDenyAtLocation(location, flagName)
 
     override fun registerFlag(flagName: String): Unit = internalAdapter.registerFlag(flagName)
 }