mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-02-16 10:30:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

New messages formatting support

Browse Source
This commit is contained in:
RonanCraft
2022-10-17 11:27:16 -04:00
parent 0463422a13
commit 4551c61b68
10 changed files with 69 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BetterRTPAddons/pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTPAddons</artifactId>
<packaging>jar</packaging>
<version>1.8.3</version>
<version>1.8.4</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -109,7 +109,7 @@
<dependency>
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId>
<version>3.4.5</version>
<version>3.5.0</version>
<scope>provided</scope>
</dependency>
<!-- ProtocolLib -->

1
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonMessages.java
View File

@@ -17,7 +17,6 @@ public class AddonMessages implements AddonsMessages {
return getLang().getString(preM + "List.Prefix");
}
public String getListDisabled() {
return getLang().getString(preM + "List.Disabled");
}

6
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsCommand.java
View File

@@ -3,6 +3,8 @@ package me.SuperRonanCraft.BetterRTPAddons;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds.PortalsCommandsTabable;
import me.SuperRonanCraft.BetterRTPAddons.cmds.AddonsCommand_Help;
import me.SuperRonanCraft.BetterRTPAddons.cmds.AddonsCommand_List;
@@ -37,10 +39,10 @@ public class AddonsCommand implements RTPCommand, RTPCommandHelpable {
return;
}
}
BetterRTP.getInstance().getText().getInvalid(sendi, label);
MessagesCore.INVALID.send(sendi, label);
} else {
List<String> list = new ArrayList<>();
list.add(BetterRTP.getInstance().getText().getHelpPrefix());
list.add(MessagesHelp.PREFIX.get());
for (AddonsHandler.Addons addon : Main.getInstance().getAddonsHandler().addons) {
RTPCommand cmd = addon.getCmd();
if (cmd instanceof RTPCommandHelpable)

14
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsMessages.java
View File

@@ -1,7 +1,9 @@
package me.SuperRonanCraft.BetterRTPAddons;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;
import me.SuperRonanCraft.BetterRTPAddons.util.LangFile;
import me.SuperRonanCraft.BetterRTPAddons.util.Message_ADDONS;
import org.bukkit.command.CommandSender;
import java.util.List;
@@ -13,18 +15,14 @@ public interface AddonsMessages {
}
default void sms(CommandSender sendi, String msg) {
BetterRTP.getInstance().getText().sms(sendi, msg);
Message_RTP.sms(sendi, msg);
}
default void sms(CommandSender sendi, List<String> msg) {
BetterRTP.getInstance().getText().sms(sendi, msg);
Message_ADDONS.sms(sendi, msg, null);
}
default String color(String str) {
return BetterRTP.getInstance().getText().color(str);
}
default String colorPre(String str) {
return BetterRTP.getInstance().getText().colorPre(str);
return Message.color(str);
}
}

2
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/logger/AddonLogger.java
View File

@@ -4,6 +4,7 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.types.CmdReload;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CommandEvent;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CommandEvent_After;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent;
import me.SuperRonanCraft.BetterRTPAddons.Addon;
import me.SuperRonanCraft.BetterRTPAddons.AddonsCommand;
@@ -74,6 +75,7 @@ public class AddonLogger implements Addon, Listener {
@EventHandler
public void onCmd(RTP_CommandEvent e) {
if (e instanceof RTP_CommandEvent_After) return;
String _str = e.getSendi().getName() + " executed `/rtp " + e.getCmd().getName() + "` at " + getDate();
Level lvl = Level.INFO;
if (e.getCmd() instanceof CmdReload)

5
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/MagicStickEvents.java
View File

@@ -6,6 +6,7 @@ import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CancelledEvent;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent;
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import me.SuperRonanCraft.BetterRTPAddons.Main;
import me.SuperRonanCraft.BetterRTPAddons.addons.magicStick.cmds.MagicStickCommand;
import me.SuperRonanCraft.BetterRTPAddons.util.Files;
@@ -42,9 +43,9 @@ public class MagicStickEvents implements Listener {
item = new ItemStack(mat);
ItemMeta meta = item.getItemMeta();
assert meta != null;
meta.setDisplayName(BetterRTP.getInstance().getText().color(title));
meta.setDisplayName(Message.color(title));
meta.setLore(lore);
lore.forEach((str) -> lore.set(lore.indexOf(str), BetterRTP.getInstance().getText().color(str)));
lore.forEach((str) -> lore.set(lore.indexOf(str), Message.color(str)));
item.setItemMeta(meta);
this.take = file.getBoolean("MagicStick.Take");

3
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java
View File

@@ -3,6 +3,7 @@ package me.SuperRonanCraft.BetterRTPAddons.addons.rtpmenu;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.types.CmdTeleport;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import me.SuperRonanCraft.BetterRTPAddons.util.Files;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
@@ -121,7 +122,7 @@ public class RTPMenu_SelectWorld {
}
private static Inventory createInventory(String title, int size) {
title = BetterRTP.getInstance().getText().color(title);
title = Message.color(title);
return Bukkit.createInventory(null, Math.max(Math.min(size, 54), 9), title);
}

5
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Help.java
View File

@@ -3,10 +3,13 @@ package me.SuperRonanCraft.BetterRTPAddons.cmds;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp;
import me.SuperRonanCraft.BetterRTPAddons.AddonMessages;
import me.SuperRonanCraft.BetterRTPAddons.AddonsCommand;
import me.SuperRonanCraft.BetterRTPAddons.AddonsHandler;
import me.SuperRonanCraft.BetterRTPAddons.Main;
import me.SuperRonanCraft.BetterRTPAddons.util.Message_ADDONS;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
@@ -17,7 +20,7 @@ public class AddonsCommand_Help implements AddonsCommands, RTPCommandHelpable {
@Override
public void execute(CommandSender sendi, String label, String[] args) {
List<String> list = new ArrayList<>();
list.add(BetterRTP.getInstance().getText().getHelpPrefix());
list.add(MessagesHelp.PREFIX.get());
for (AddonsCommand.AddonCmds cmds : AddonsCommand.AddonCmds.values()) {
if (cmds.cmd instanceof RTPCommandHelpable)
list.add(((RTPCommandHelpable) cmds.cmd).getHelp().replace("%command%", label));

12
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Version.java
View File

@@ -2,24 +2,20 @@ package me.SuperRonanCraft.BetterRTPAddons.cmds;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import me.SuperRonanCraft.BetterRTPAddons.AddonMessages;
import me.SuperRonanCraft.BetterRTPAddons.AddonsHandler;
import me.SuperRonanCraft.BetterRTPAddons.Main;
import me.SuperRonanCraft.BetterRTPAddons.util.Message_ADDONS;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
import java.util.List;
public class AddonsCommand_Version implements AddonsCommands, RTPCommandHelpable {
public class AddonsCommand_Version implements AddonsCommands {
@Override
public void execute(CommandSender sendi, String label, String[] args) {
sendi.sendMessage(BetterRTP.getInstance().getText()
.colorPre("&aVersion #&e" + Main.getInstance().getDescription().getVersion()));
}
@Override
public String getHelp() {
return Main.getInstance().msgs.getBaseList();
Message_ADDONS.sms(sendi, "&aVersion #&e" + Main.getInstance().getDescription().getVersion());
}
}

42
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/util/Message_ADDONS.java Normal file
View File

@@ -0,0 +1,42 @@
package me.SuperRonanCraft.BetterRTPAddons.util;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.file.FileData;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import org.bukkit.command.CommandSender;
import java.util.List;
public class Message_ADDONS implements Message {
public static Message_ADDONS msg = new Message_ADDONS();
public static FileData getLang() {
return BetterRTP.getInstance().getFiles().getLang();
}
@Override
public FileData lang() {
return getLang();
}
public static void sms(CommandSender sendi, String msg) {
Message.sms(Message_ADDONS.msg, sendi, msg);
}
public static void sms(CommandSender sendi, String msg, Object placeholderInfo) {
Message.sms(Message_ADDONS.msg, sendi, msg, placeholderInfo);
}
public static void sms(CommandSender sendi, String msg, List<Object> placeholderInfo) {
Message.sms(Message_ADDONS.msg, sendi, msg, placeholderInfo);
}
public static void sms(CommandSender sendi, List<String> msg, List<Object> placeholderInfo) {
Message.sms(sendi, msg, placeholderInfo);
}
public static String getPrefix() {
return Message.getPrefix(Message_ADDONS.msg);
}
}