mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-02 20:56:40 +00:00
Please read the commit description for a full changelog
- Reimplements the clownfish toggle in a much better way - Completely rewrites the plugin's chat formatting system - Tags now use MiniMessage instead of color codes. New tags are automatically converted. - /adminchat now uses MiniMessage for its messages - /autoclear and /autotp now use MiniMessage for their messages - /banip now uses MiniMessage for its messages - /bird now uses MiniMessage for its messages (and also now shows a rainbow message) - /blockcmd now uses MiniMessage for its messages - /clownfish now uses MiniMessage for its messages - /notes now uses MiniMessage for its messages - /op now uses MiniMessage for its messages - /plc now uses MiniMessage for its messages - Fixes bug in /stop where the stop message was not showing properly - Condenses /tagrainbow into /tag and integrates /tag gradient into /tag set using MiniMessage - /toggle now uses MiniMessage for its messages - /tossmob now uses MiniMessage for its messages - /unban, /unbanip, and /unbanname now use MiniMessage for its messages - /unblockcmd now uses MiniMessage for its messages - /uncage now uses MiniMessage for its messages - /undisguiseall now uses MiniMessage for its messages - /unlinkdiscord now uses MiniMessage for its messages - /unmute now uses MiniMessage for its messages - /vanish now uses MiniMessage for its messages - /vote now partially uses MiniMessage for its messages - /warn now uses MiniMessage for its messages - Deprecates FreedomCommand.msg(String) for now
This commit is contained in:
@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.api.ShopItem;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@ -16,20 +17,27 @@ public class Command_clownfish extends FreedomCommand
|
||||
@Override
|
||||
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
|
||||
{
|
||||
if (plugin.sh == null) {
|
||||
sender.sendMessage(Component.text("The shop is currently disabled."));
|
||||
if (plugin.sh == null)
|
||||
{
|
||||
msgNew("<red>Shop is currently disabled.");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH) && (!plugin.lp.CLOWNFISH_TOGGLE.contains(playerSender.getName())))
|
||||
if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH))
|
||||
{
|
||||
playerSender.getInventory().addItem(plugin.sh.getClownFish());
|
||||
msg("You have been given a Clown Fish", ChatColor.GREEN);
|
||||
msgNew("<green>You have been given a <name>.", Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
|
||||
}
|
||||
else if (plugin.pl.getPlayer(playerSender).isClownfishDisabled())
|
||||
{
|
||||
msgNew("<red>An admin has disabled your ability to use the <name>. Guess you were the clown after all.",
|
||||
Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
|
||||
}
|
||||
else
|
||||
{
|
||||
msg("You do not own a Clown Fish or an admin has toggled your ability to use it. Purchase one from the shop.", ChatColor.RED);
|
||||
msgNew("<red>You don't own a <name>! Purchase one from the shop.", Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user