v2.3.0

- Empty messages won't be sent anymore

Author: randombyte-developer

build.gradle

@@ -1,12 +1,12 @@
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.2.41"
     id "org.jetbrains.kotlin.kapt" version "1.2.41"
-    id "com.github.johnrengelman.shadow" version "1.2.4"
+    id "com.github.johnrengelman.shadow" version "2.0.4"
     id "flavor.pie.promptsign" version "1.0.2"
 }
 
 group "de.randombyte"
-version "2.2.2"
+version "2.3.0"
 
 repositories {
     jcenter()

src/main/kotlin/de/randombyte/unity/Unity.kt

@@ -56,7 +56,7 @@ class Unity @Inject constructor(
     companion object {
         const val ID = "unity"
         const val NAME = "Unity"
-        const val VERSION = "2.2.2"
+        const val VERSION = "2.3.0"
         const val AUTHOR = "RandomByte"
 
         const val NUCLEUS_ID = "nucleus"

src/main/kotlin/de/randombyte/unity/commands/AcceptRequestCommand.kt

@@ -37,7 +37,7 @@ class AcceptRequestCommand(
         val broadcastMessage = config.texts.unityBroadcast.apply(mapOf(
                 "member1" to requester.name,
                 "member2" to player.name)).build()
-        broadcast(broadcastMessage)
+        broadcastIfNotEmpty(broadcastMessage)
 
         return CommandResult.success()
     }

src/main/kotlin/de/randombyte/unity/commands/CancelRequestCommand.kt

@@ -24,11 +24,11 @@ class CancelRequestCommand(
         removeRequest(player.uniqueId, requestee.uniqueId)
 
         val config = configAccessor.get()
-        requestee.sendMessage(config.texts.cancelledRequestMessage.apply(mapOf(
+        requestee.sendMessageIfNotEmpty(config.texts.cancelledRequestMessage.apply(mapOf(
                 "requester" to player.name
         )).build())
 
-        player.sendMessage(config.texts.sentCancellation.apply(mapOf(
+        player.sendMessageIfNotEmpty(config.texts.sentCancellation.apply(mapOf(
                 "requestee" to requestee.name
         )).build())
 

src/main/kotlin/de/randombyte/unity/commands/DeclineRequestCommand.kt

@@ -26,7 +26,7 @@ class DeclineRequestCommand(
         val broadcastMessage = configAccessor.get().texts.declinedRequestBroadcast.apply(mapOf(
                 "requester" to requester.name,
                 "requestee" to player.name)).build()
-        broadcast(broadcastMessage)
+        broadcastIfNotEmpty(broadcastMessage)
 
         return CommandResult.success()
     }

src/main/kotlin/de/randombyte/unity/commands/DivorceCommand.kt

@@ -32,7 +32,7 @@ class DivorceCommand(
         val divorceBroadcast = config.texts.divorceBroadcast.apply(mapOf(
                 "member1" to player.name,
                 "member2" to otherMemberName)).build()
-        broadcast(divorceBroadcast)
+        broadcastIfNotEmpty(divorceBroadcast)
 
         return CommandResult.success()
     }

src/main/kotlin/de/randombyte/unity/commands/GiftCommand.kt

@@ -25,8 +25,8 @@ class GiftCommand(
         otherPlayer.give(itemInHand)
         player.setItemInHand(HandTypes.MAIN_HAND, null)
 
-        otherPlayer.sendMessage(config.texts.receivedGift.apply(mapOf("otherMember" to player.name)).build())
-        player.sendMessage(config.texts.sentGift.apply(mapOf("otherMember" to otherPlayer.name)).build())
+        otherPlayer.sendMessageIfNotEmpty(config.texts.receivedGift.apply(mapOf("otherMember" to player.name)).build())
+        player.sendMessageIfNotEmpty(config.texts.sentGift.apply(mapOf("otherMember" to otherPlayer.name)).build())
 
         return CommandResult.success()
     }

src/main/kotlin/de/randombyte/unity/commands/RequestUnityCommand.kt

@@ -32,11 +32,11 @@ class RequestUnityCommand(
         val acceptRequest = config.texts.acceptRequestAction.action(TextActions.runCommand("/unity accept ${player.name}"))
         val declineRequest = config.texts.declineRequestAction.action(TextActions.runCommand("/unity decline ${player.name}"))
         val requestMessage = config.texts.gotRequest.apply(mapOf("requester" to player.name)).build()
-        requestee.sendMessage(requestMessage + " " + acceptRequest + " " + declineRequest)
+        requestee.sendMessageIfNotEmpty(requestMessage + " " + acceptRequest + " " + declineRequest)
 
-        player.sendMessage(config.texts.sentRequest.apply(mapOf("requestee" to requestee.name)).build())
+        player.sendMessageIfNotEmpty(config.texts.sentRequest.apply(mapOf("requestee" to requestee.name)).build())
 
-        broadcast(config.texts.requestBroadcast.apply(mapOf(
+        broadcastIfNotEmpty(config.texts.requestBroadcast.apply(mapOf(
                 "requester" to player.name,
                 "requestee" to requestee.name
         )).build())

src/main/kotlin/de/randombyte/unity/commands/TeleportCommand.kt

@@ -15,7 +15,7 @@ class TeleportCommand(
     override fun executedByUnityMember(player: Player, args: CommandContext, thisUnity: Config.Unity, config: Config): CommandResult {
         val otherMember = thisUnity.getOtherMember(player.uniqueId).getUser()!!
         val otherPlayer = otherMember.player
-                .orElseThrow { throw CommandException("'${otherMember.name}' must be online to excute this command!".toText()) }
+                .orElseThrow { throw CommandException("'${otherMember.name}' must be online to execute this command!".toText()) }
 
         player.location = otherPlayer.location
 

src/main/kotlin/de/randombyte/unity/commands/UnityCommand.kt

@@ -16,7 +16,7 @@ abstract class UnityCommand(
         val config = configAccessor.get()
         val unities = config.unities
         val unity = unities.getUnity(player.uniqueId)
-                ?: throw CommandException("You must be married to someone to execute this command!".toText()) // TODO: change to 'unity'
+                ?: throw CommandException("You must be married to someone to execute this command!".toText())
         return executedByUnityMember(player, args, unity, config)
     }