Skip to content

Added option to allow unsafe enchantments #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2025
Merged

Added option to allow unsafe enchantments #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/net/thenextlvl/tweaks/command/item/EnchantCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void register(Commands registrar) {
.requires(stack -> stack.getSender() instanceof Player player
&& player.hasPermission("tweaks.command.enchant"))
.then(Commands.argument("enchantment", ArgumentTypes.resourceKey(RegistryKey.ENCHANTMENT))
.suggests(new EnchantSuggestionProvider())
.suggests(new EnchantSuggestionProvider(plugin))
.then(Commands.argument("level", IntegerArgumentType.integer(1, max))
.suggests(this::suggestLevels)
.executes(context -> enchant(context, context.getArgument("level", int.class))))
Expand Down Expand Up @@ -79,7 +79,7 @@ private int enchant(CommandContext<CommandSourceStack> context, int level) {
plugin.bundle().sendMessage(player, "command.hold.item");
return 0;
}
if (!enchantment.canEnchantItem(item)) {
if (!plugin.config().general.unsafeEnchantments && !enchantment.canEnchantItem(item)) {
plugin.bundle().sendMessage(player, "command.enchantment.applicable",
Placeholder.component("item", Component.translatable(item)));
return 0;
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/net/thenextlvl/tweaks/command/suggestion/EnchantSuggestionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,28 @@
import io.papermc.paper.command.brigadier.CommandSourceStack;
import io.papermc.paper.registry.RegistryAccess;
import io.papermc.paper.registry.RegistryKey;
import net.thenextlvl.tweaks.TweaksPlugin;
import org.bukkit.entity.Player;
import org.jspecify.annotations.NullMarked;

import java.util.concurrent.CompletableFuture;

@NullMarked
public class EnchantSuggestionProvider implements SuggestionProvider<CommandSourceStack> {
private final TweaksPlugin plugin;

public EnchantSuggestionProvider(TweaksPlugin plugin) {
this.plugin = plugin;
}

@Override
public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) {
if (!(context.getSource().getSender() instanceof Player player)) return builder.buildFuture();
var item = player.getInventory().getItemInMainHand();
RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT).stream()
.filter(enchantment -> enchantment.canEnchantItem(item))
.filter(enchantment -> item.getEnchantments().containsKey(enchantment)
.filter(enchantment -> plugin.config().general.unsafeEnchantments || enchantment.canEnchantItem(item))
.filter(enchantment -> plugin.config().general.unsafeEnchantments
|| item.getEnchantments().containsKey(enchantment)
|| item.getEnchantments().keySet().stream().noneMatch(enchantment::conflictsWith))
.map(enchantment -> enchantment.key().asString())
.filter(s -> s.contains(builder.getRemaining()))
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/thenextlvl/tweaks/model/PluginConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public static class GeneralConfig {
public @SerializedName("message-deletion-timeout") long messageDeletionTimeout = TimeUnit.MINUTES.toMillis(10);
public @SerializedName("back-buffer-stack-size") int backBufferStackSize = 5;
public @SerializedName("default-permission-level") byte defaultPermissionLevel = -1;
public @SerializedName("allow-unsafe-enchantments") boolean unsafeEnchantments = false;
public @SerializedName("enchantment-overflow") boolean enchantmentOverflow = false;
public @SerializedName("override-join-message") boolean overrideJoinMessage = true;
public @SerializedName("override-quit-message") boolean overrideQuitMessage = true;
Expand Down