Plexus-Mirror/Module-TFMExtras
1
0
Fork 0
mirror of https://github.com/plexusorg/Module-TFMExtras.git synced 2024-12-28 02:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from notsceptor/master

Browse source 
Implemented /enchant add and /enchant remove correctly
This commit is contained in:
Telesphoreo 2024-06-04 09:20:15 -05:00 committed by GitHub
commit 30aa94c616
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 73 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/dev/plex/extras/TFMExtras.java
View file

@ -122,6 +122,15 @@ public class TFMExtras extends PlexModule
addDefaultMessage("islandMemberExists", "<red>This player is already a member of your island!");
addDefaultMessage("receivedInviteForIsland", "<green>You have been invited to join "); //TODO: Finish this message... my laptop isn't liking minecraft so I can't do formatting for it, and do receivedInviteForIsland message
addDefaultMessage("playersExpelled", "<gray>Pushed away players: <white><em>{0}", "0 - The list of players");
addDefaultMessage("enchantList", "<dark_gray>All possible enchantments are for this item are: <gray>{0}", "0 - A comma-separated list of enchantment names");
addDefaultMessage("enchantAddAll", "<gray>Added all possible enchantments for this item.");
addDefaultMessage("enchantReset", "<gray>Removed every enchantment from this item.");
addDefaultMessage("enchantMustHoldItem", "<red>You must be holding an enchantable item.");
addDefaultMessage("enchantSpecify", "<red>Please specify an enchantment.");
addDefaultMessage("enchantInvalid", "<red>Invalid enchantment for this item.");
addDefaultMessage("enchantAdd", "<gray>Added {0} {1}", "0 - The enchantment name", "1 - The enchantment level");
addDefaultMessage("enchantRemove", "<gray>Removed {0}", "0 - The enchantment name");
addDefaultMessage("enchantInvalidLevel", "<red>Invalid enchantment level.");
}
@Override

78
src/main/java/dev/plex/extras/command/EnchantCommand.java
View file

@ -5,15 +5,14 @@ import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.source.RequiredCommandSource;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.apache.commons.lang3.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.*;
import org.bukkit.command.CommandSender;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
@ -36,27 +35,72 @@ public class EnchantCommand extends PlexCommand
ItemStack item = player.getInventory().getItemInMainHand();
if (item.getType() == Material.AIR)
{
return MiniMessage.miniMessage().deserialize("<red>You must be holding an enchantable item.");
return messageComponent("enchantMustHoldItem");
}
if (args.length == 1)
switch (args[0].toLowerCase())
{
if (args[0].equalsIgnoreCase("list"))
case "add":
if (args.length < 2)
{
return MiniMessage.miniMessage().deserialize("<dark_gray>All possible enchantments are for this item are: <gray>" + StringUtils.join(getEnchantmentNames(item), ", "));
return messageComponent("enchantSpecify");
}
if (args[0].equalsIgnoreCase("addall"))
Enchantment enchantmentToAdd = Registry.ENCHANTMENT.get(NamespacedKey.minecraft(args[1].toLowerCase()));
if (enchantmentToAdd == null || !enchantmentToAdd.canEnchantItem(item))
{
return messageComponent("enchantInvalid");
}
int levelToAdd = enchantmentToAdd.getMaxLevel();
if (args.length >= 3)
{
try
{
levelToAdd = Integer.parseInt(args[2]);
if (levelToAdd < 1 || levelToAdd > 255)
{
return messageComponent("enchantInvalidLevel");
}
}
catch (NumberFormatException e)
{
return messageComponent("enchantInvalidLevel");
}
}
item.addUnsafeEnchantment(enchantmentToAdd, levelToAdd);
player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_USE, 1, 1);
return messageComponent("enchantAdd", enchantmentToAdd.getKey().getKey(), levelToAdd);
case "remove":
if (args.length < 2)
{
return messageComponent("enchantSpecify");
}
Enchantment enchantmentToRemove = Registry.ENCHANTMENT.get(NamespacedKey.minecraft(args[1].toLowerCase()));
if (enchantmentToRemove == null || !item.containsEnchantment(enchantmentToRemove))
{
return messageComponent("enchantInvalid");
}
item.removeEnchantment(enchantmentToRemove);
player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_USE, 1, 1);
return messageComponent("enchantRemove", enchantmentToRemove.getKey().getKey());
case "list":
return messageComponent("enchantList", StringUtils.join(getEnchantmentNames(item), ", "));
case "addall":
getEnchantments(item).forEach(enchantment -> item.addEnchantment(enchantment, enchantment.getMaxLevel()));
player.playSound(player, Sound.BLOCK_ANVIL_USE, 1, 1);
return MiniMessage.miniMessage().deserialize("<gray>Added all possible enchantments for this item.");
}
if (args[0].equalsIgnoreCase("reset"))
{
return messageComponent("enchantAddAll");
case "reset":
item.getEnchantments().keySet().forEach(item::removeEnchantment);
player.playSound(player, Sound.BLOCK_ANVIL_USE, 1, 1);
return MiniMessage.miniMessage().deserialize("<gray>Removed every enchantment from this item.");
}
return messageComponent("enchantReset");
}
return null;
}
@ -82,12 +126,12 @@ public class EnchantCommand extends PlexCommand
{
return Arrays.asList("add", "reset", "list", "addall", "remove");
}
if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove"))
if (args.length == 2 && args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove"))
{
Player player = Bukkit.getPlayer(sender.getName());
if (player != null)
{
return List.of(getEnchantmentNames(player.getActiveItem()));
return List.of(getEnchantmentNames(player.getInventory().getItemInMainHand()));
}
}
return Collections.emptyList();