SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up send message again to use LibsMsg.send

Browse Source
This commit is contained in:
libraryaddict
2020-07-04 00:44:22 +12:00
parent b5b9b432f7
commit 8a59d64702
41 changed files with 270 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/libraryaddict/disguise/commands/interactions/CopyDisguiseInteraction.java
View File

@@ -36,7 +36,7 @@ public class CopyDisguiseInteraction implements LibsEntityInteract {
DisguiseParser.parseToString(disguise), true);
}
} else {
DisguiseUtilities.sendMessage(player, LibsMsg.TARGET_NOT_DISGUISED);
LibsMsg.TARGET_NOT_DISGUISED.send(player);
}
}
}

26
src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseEntityInteraction.java
View File

@@ -53,7 +53,7 @@ public class DisguiseEntityInteraction implements LibsEntityInteract {
if (disguise.isMiscDisguise() && !DisguiseConfig.isMiscDisguisesForLivingEnabled() &&
entity instanceof LivingEntity) {
DisguiseUtilities.sendMessage(p, LibsMsg.DISABLED_LIVING_TO_MISC);
LibsMsg.DISABLED_LIVING_TO_MISC.send(p);
} else {
if (entity instanceof Player && DisguiseConfig.isNameOfPlayerShownAboveDisguise() &&
!entity.hasPermission("libsdisguises.hidename")) {
@@ -77,37 +77,29 @@ public class DisguiseEntityInteraction implements LibsEntityInteract {
if (disguise.isDisguiseInUse()) {
if (disguise.isPlayerDisguise()) {
if (entity instanceof Player) {
DisguiseUtilities
.sendMessage(p, LibsMsg.LISTEN_ENTITY_PLAYER_DISG_PLAYER, entityName, disguiseName);
LibsMsg.LISTEN_ENTITY_PLAYER_DISG_PLAYER.send(p, entityName, disguiseName);
} else {
DisguiseUtilities
.sendMessage(p, LibsMsg.LISTEN_ENTITY_ENTITY_DISG_PLAYER, entityName, disguiseName);
LibsMsg.LISTEN_ENTITY_ENTITY_DISG_PLAYER.send(p, entityName, disguiseName);
}
} else {
if (entity instanceof Player) {
DisguiseUtilities
.sendMessage(p, LibsMsg.LISTEN_ENTITY_PLAYER_DISG_ENTITY, entityName, disguiseName);
LibsMsg.LISTEN_ENTITY_PLAYER_DISG_ENTITY.send(p, entityName, disguiseName);
} else {
DisguiseUtilities
.sendMessage(p, LibsMsg.LISTEN_ENTITY_ENTITY_DISG_ENTITY, entityName, disguiseName);
LibsMsg.LISTEN_ENTITY_ENTITY_DISG_ENTITY.send(p, entityName, disguiseName);
}
}
} else {
if (disguise.isPlayerDisguise()) {
if (entity instanceof Player) {
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_ENTITY_PLAYER_DISG_PLAYER_FAIL, entityName,
disguiseName);
LibsMsg.LISTEN_ENTITY_PLAYER_DISG_PLAYER_FAIL.send(p, entityName, disguiseName);
} else {
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_ENTITY_ENTITY_DISG_PLAYER_FAIL, entityName,
disguiseName);
LibsMsg.LISTEN_ENTITY_ENTITY_DISG_PLAYER_FAIL.send(p, entityName, disguiseName);
}
} else {
if (entity instanceof Player) {
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_ENTITY_PLAYER_DISG_ENTITY_FAIL, entityName,
disguiseName);
LibsMsg.LISTEN_ENTITY_PLAYER_DISG_ENTITY_FAIL.send(p, entityName, disguiseName);
} else {
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_ENTITY_ENTITY_DISG_ENTITY_FAIL, entityName,
disguiseName);
LibsMsg.LISTEN_ENTITY_ENTITY_DISG_ENTITY_FAIL.send(p, entityName, disguiseName);
}
}
}

6
src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java
View File

@@ -38,7 +38,7 @@ public class DisguiseModifyInteraction implements LibsEntityInteract {
Disguise disguise = DisguiseAPI.getDisguise(p, entity);
if (disguise == null) {
DisguiseUtilities.sendMessage(p, LibsMsg.UNDISG_PLAYER_FAIL, entityName);
LibsMsg.UNDISG_PLAYER_FAIL.send(p, entityName);
return;
}
@@ -48,7 +48,7 @@ public class DisguiseModifyInteraction implements LibsEntityInteract {
DisguisePerm disguisePerm = new DisguisePerm(disguise.getType());
if (!perms.isAllowedDisguise(disguisePerm, Arrays.asList(options))) {
DisguiseUtilities.sendMessage(p, LibsMsg.DMODPLAYER_NOPERM);
LibsMsg.DMODPLAYER_NOPERM.send(p);
return;
}
@@ -56,7 +56,7 @@ public class DisguiseModifyInteraction implements LibsEntityInteract {
DisguiseParser
.callMethods(p, disguise, perms, disguisePerm, new ArrayList<>(Arrays.asList(options)), options,
"DisguiseModifyEntity");
DisguiseUtilities.sendMessage(p, LibsMsg.LISTENER_MODIFIED_DISG);
LibsMsg.LISTENER_MODIFIED_DISG.send(p);
}
catch (DisguiseParseException ex) {
if (ex.getMessage() != null) {

8
src/main/java/me/libraryaddict/disguise/commands/interactions/UndisguiseEntityInteraction.java
View File

@@ -26,14 +26,14 @@ public class UndisguiseEntityInteraction implements LibsEntityInteract {
DisguiseAPI.undisguiseToAll(entity);
if (entity instanceof Player)
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_UNDISG_PLAYER, entityName);
LibsMsg.LISTEN_UNDISG_PLAYER.send(p, entityName);
else
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_UNDISG_ENT, entityName);
LibsMsg.LISTEN_UNDISG_ENT.send(p, entityName);
} else {
if (entity instanceof Player)
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_UNDISG_PLAYER_FAIL, entityName);
LibsMsg.LISTEN_UNDISG_PLAYER_FAIL.send(p, entityName);
else
DisguiseUtilities.sendMessage(p, LibsMsg.LISTEN_UNDISG_ENT_FAIL, entityName);
LibsMsg.LISTEN_UNDISG_ENT_FAIL.send(p, entityName);
}
}
}