Move protection messages to action bar

Author: ChanceSD

pvpmanager/build.gradle

@@ -69,7 +69,7 @@ ext {
         'project.groupId'    : project.group,
         'project.version'    : project.version,
         'project.description': project.description,
-        'config.version'     : '201',
+        'config.version'     : '204',
         'database.version'   : '1'
     ]
 }

pvpmanager/pom.xml

@@ -16,7 +16,7 @@
 	<url>https://github.com/ChanceSD/PvPManager</url>
 
 	<properties>
-		<config.version>203</config.version>
+		<config.version>204</config.version>
 		<database.version>1</database.version>
 		<argLine/>
 	</properties>

pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java

@@ -146,6 +146,8 @@ public enum Conf {
 	HEALTH_BELOW_NAME(ConfSection.OTHER_SETTINGS, "Show health under name.Enabled", true, Boolean.class),
 	HEALTH_BELOW_NAME_SYMBOL(ConfSection.OTHER_SETTINGS, "Show health under name.Display Name", ChatUtils::colorize, String.class, String.class),
 
+	PROTECTION_MESSAGES_TO_ACTIONBAR(ConfSection.OTHER_SETTINGS, "Protection Messages to Action Bar", bool -> MCVersion.isAtLeast(MCVersion.V1_10) && bool, Boolean.class, Boolean.class),
+
 	// Disable on hit
 	DISABLE_FLY(ConfSection.DISABLE_ON_HIT, "Fly", true, Boolean.class),
 	RESTORE_FLY(ConfSection.DISABLE_ON_HIT, "Restore Fly", true, Boolean.class),

pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Lang.java

@@ -361,7 +361,11 @@ private static String findKeyBefore(final String targetKey) {
 	public static void messageProtection(final ProtectionResult result, final Player player, final Player attacked) {
 		final String message = getProtectionMessage(result, attacked);
 		final CombatPlayer receiver = plugin.getPlayerManager().get(player);
-		receiver.message(message);
+		if (Conf.PROTECTION_MESSAGES_TO_ACTIONBAR.asBool()) {
+			receiver.sendActionBar(message, 500);
+		} else {
+			receiver.message(message);
+		}
 	}
 
 	public static String getProtectionMessage(final ProtectionResult result, final Player attacked) {

pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/RegionCheckTask.java

@@ -16,7 +16,6 @@
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.sdutils.scheduler.ScheduleUtils;
-import me.chancesd.sdutils.utils.Log;
 
 public class RegionCheckTask extends BukkitRunnable implements Listener {
 

pvpmanager/src/main/resources/config.yml

@@ -266,6 +266,8 @@ Other Settings:
   PvP Blood: true
   # Ignore hits from snowballs, eggs, fishing rod and others
   Ignore No Damage Hits: true
+  # Send protection messages (PvP disabled, newbie protection, etc.) to action bar instead of chat
+  Protection Messages to Action Bar: true
   # Player Drop Mode -> What happens to a player's drops and exp on death
   # The options are 'ALWAYS' - (PvPManager does nothing, feature is disabled, usually best to avoid conflicts with death chest plugins, etc),
   # mode 'DROP' - (Players drop items when killed in PvP but not in PvE),

pvpmanager/src/test/java/me/chancesd/pvpmanager/listener/EntityListenerTest.java

@@ -32,7 +32,6 @@
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionType;
-import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
@@ -204,7 +203,6 @@ final void cancelNewbie() {
 		createAttack(false);
 
 		assertEquals(ProtectionType.NEWBIE, ph.checkProtection(attacker, defender).type());
-		verify(attacker, times(2)).sendMessage(Lang.NEWBIE_PROTECTION_ON_HIT.msg());
 
 		verify(mockEvent).setCancelled(true);
 		verify(projMockEvent).setCancelled(true);
@@ -216,7 +214,6 @@ final void cancelPvPDisabled() {
 		createAttack(false);
 
 		assertEquals(ProtectionType.PVPDISABLED, ph.checkProtection(attacker, defender).type());
-		verify(attacker, times(2)).sendMessage(Lang.ATTACK_DENIED_OTHER.msg(defender.getName()));
 
 		verify(mockEvent).setCancelled(true);
 		verify(projMockEvent).setCancelled(true);
@@ -316,7 +313,6 @@ final void tntAttack() {
 		assertTrue(CombatUtils.isPvP(tntEvent));
 
 		callEvent(tntEvent);
-		// Verify combat tagging behavior for TNT attacks
 		assertTrue(combatAttacker.isInCombat());
 		assertTrue(combatDefender.isInCombat());
 	}
@@ -330,7 +326,6 @@ final void areaEffectCloudAttack() {
 		assertTrue(CombatUtils.isPvP(cloudEvent));
 
 		callEvent(cloudEvent);
-		// Verify combat tagging for area effect clouds
 		assertTrue(combatAttacker.isInCombat());
 		assertTrue(combatDefender.isInCombat());
 	}