MinecraftMods/Arias-Essentials
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Move messages to central location and utilize new message helper util

Browse source
This commit is contained in:
Aria 2023-02-28 18:25:39 -07:00
parent 6a967272e6
commit f492ca9acd
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/dev/zontreck/essentials/Messages.java
View file

@ -4,8 +4,35 @@ import dev.zontreck.libzontreck.chat.ChatColor;
public class Messages {
public static final String ESSENTIALS_PREFIX;
public static final String RTP_SEARCHING;
public static final String RTP_CANCELLED;
public static final String RTP_ABORTED;
public static final String CONDITIONAL_RTP_ABORT;
public static final String HOVER_WARP_INFO;
public static final String WARP_OWNER;
public static final String WARP_HOVER_FORMAT;
public static final String WARP_RTP;
public static final String COUNT;
public static final String WARP_STANDARD;
public static final String WARP_ACCESS_FORMAT;
static{
ESSENTIALS_PREFIX = ChatColor.doColors("!Gray![!Dark_Green!AE!Gray!] ");
ESSENTIALS_PREFIX = "!Gray![!Dark_Green!AE!Gray!] ";
RTP_SEARCHING = ESSENTIALS_PREFIX + "!Dark_Purple!Searching... Attempt !Gold![0]!White!/!Dark_Red![1]";
RTP_CANCELLED = ESSENTIALS_PREFIX + "!Dark_Red!Last position was good, but another mod asked us not to send you there. This could happen with a claims mod.";
RTP_ABORTED = ESSENTIALS_PREFIX + "!Dark_Red!Could not find a suitable location in [0] attempts. Giving up. [1]";
CONDITIONAL_RTP_ABORT = "!Dark_Red!You may try again in !Gold![0] !Dark_Red!minutes and !Gold![1] !Dark_Red!second(s)";
HOVER_WARP_INFO = "!Gold![Hover to see the Warp's info]";
WARP_HOVER_FORMAT = "[0]\n[1]"; // 0 = owner, 1 = public infos
WARP_RTP = "!Dark_Purple!This warp is a RTP. It will position you randomly in the dimension [0]";
WARP_STANDARD = "!Green!This is a standard warp.";
WARP_OWNER = "!Dark_Purple!The warp's owner is [0][1]";
COUNT = ESSENTIALS_PREFIX + "!Dark_Purple!There are [0] [1](s) available";
WARP_ACCESS_FORMAT = "This warp is [0]";
}
}

7
src/main/java/dev/zontreck/essentials/util/RandomPositionLocator.java
View file

@ -31,7 +31,8 @@ public class RandomPositionLocator implements Runnable
@Override
public void run() {
if(!AriasEssentials.ALIVE)return;
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(Messages.ESSENTIALS_PREFIX + ChatColor.doColors(" !Dark_Purple!Searching... Attempt "+String.valueOf(contain.tries)+"/30")), contain.container.PlayerInst.server);
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(ChatHelpers.macroize(Messages.RTP_SEARCHING, String.valueOf(contain.tries), "30")), contain.container.PlayerInst.server);
ServerLevel levl = contain.container.Dimension;
ChunkAccess chunk = levl.getChunk(contain.container.world_pos.Position.asBlockPos());
@ -56,7 +57,7 @@ public class RandomPositionLocator implements Runnable
{
contain.complete=false;
contain.container.Position = contain.container.world_pos.Position.asMinecraftVector();
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(Messages.ESSENTIALS_PREFIX + ChatColor.doColors(" !Dark_Red!Last position checked was probably claimed. Another mod has asked us not to send you to that location, continuing the search")), contain.container.PlayerInst.server);
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(ChatHelpers.macroize(Messages.RTP_CANCELLED)), contain.container.PlayerInst.server);
break;
}else {
@ -78,7 +79,7 @@ public class RandomPositionLocator implements Runnable
if(contain.tries > 30)
{
// Abort
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(Messages.ESSENTIALS_PREFIX + ChatColor.doColors(" !Dark_Red!Could not find a suitable location in 30 attempts")), contain.container.PlayerInst.server);
ChatHelpers.broadcastTo(contain.container.PlayerInst.getUUID(), new TextComponent(ChatHelpers.macroize(Messages.RTP_ABORTED,"30")), contain.container.PlayerInst.server);
contain.aborted=true;
return;
}else {