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

7
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@@ -383,10 +383,10 @@ public class DisguiseUtilities {
if (reference != null && DisguiseUtilities.addClonedDisguise(reference, disguise)) {
String entityName = DisguiseType.getType(toClone).toReadable();
DisguiseUtilities.sendMessage(player, LibsMsg.MADE_REF, entityName, reference);
DisguiseUtilities.sendMessage(player, LibsMsg.MADE_REF_EXAMPLE, reference);
LibsMsg.MADE_REF.send(player, entityName, reference);
LibsMsg.MADE_REF_EXAMPLE.send(player, reference);
} else {
DisguiseUtilities.sendMessage(player, LibsMsg.REF_TOO_MANY);
LibsMsg.REF_TOO_MANY.send(player);
}
}
@@ -2170,6 +2170,7 @@ public class DisguiseUtilities {
}
}
@Deprecated
public static void sendMessage(CommandSender sender, LibsMsg msg, Object... args) {
if (!NmsVersion.v1_16.isSupported()) {
String message = msg.get(args);

10
src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
View File

@@ -125,7 +125,7 @@ public class DisguiseListener implements Listener {
if (disguises.length > 0) {
DisguiseAPI.undisguiseToAll(player);
DisguiseUtilities.sendMessage(player, LibsMsg.BLOWN_DISGUISE);
LibsMsg.BLOWN_DISGUISE.send(player);
}
}
@@ -198,14 +198,14 @@ public class DisguiseListener implements Listener {
if (disguises.length > 0) {
event.setCancelled(true);
DisguiseUtilities.sendMessage(attacker, LibsMsg.CANT_ATTACK_DISGUISED);
LibsMsg.CANT_ATTACK_DISGUISED.send(attacker);
} else if (DisguiseConfig.getPvPTimer() > 0 && attacker.hasMetadata("LastDisguise")) {
long lastDisguised = attacker.getMetadata("LastDisguise").get(0).asLong();
if (lastDisguised + DisguiseConfig.getPvPTimer() * 1000 > System.currentTimeMillis()) {
event.setCancelled(true);
DisguiseUtilities.sendMessage(attacker, LibsMsg.CANT_ATTACK_DISGUISED_RECENTLY);
LibsMsg.CANT_ATTACK_DISGUISED_RECENTLY.send(attacker);
}
}
}
@@ -551,7 +551,7 @@ public class DisguiseListener implements Listener {
disguise.removeDisguise();
}
DisguiseUtilities.sendMessage(event.getPlayer(), LibsMsg.SWITCH_WORLD_DISGUISE_REMOVED);
LibsMsg.SWITCH_WORLD_DISGUISE_REMOVED.send(event.getPlayer());
}
}
@@ -646,7 +646,7 @@ public class DisguiseListener implements Listener {
disguise.removeDisguise();
}
DisguiseUtilities.sendMessage(event.getPlayer(), LibsMsg.SWITCH_WORLD_DISGUISE_REMOVED);
LibsMsg.SWITCH_WORLD_DISGUISE_REMOVED.send(event.getPlayer());
}
} else {
// Stupid hack to fix worldswitch invisibility bug & paper packet bug

7
src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java
View File

@@ -4,6 +4,8 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import net.md_5.bungee.api.chat.BaseComponent;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
/**
* Created by libraryaddict on 15/06/2017.
@@ -371,6 +373,11 @@ public enum LibsMsg {
return DisguiseUtilities.getColoredChat(string);
}
public void send(CommandSender player, Object... strings) {
DisguiseUtilities.sendMessage(player, this, strings);
}
@Deprecated
public String get(Object... strings) {
int matches = StringUtils.countMatches(getRaw(), "%s");