From c591a1c2356ca94249355f803911cb09f74ebcb8 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Mon, 15 Jul 2024 01:33:44 -0700 Subject: [PATCH] /fix cooldown, and removed luckperms dependency (unused) --- pom.xml | 6 ---- .../io/github/lncvrt/lncvrtbox/LncvrtBox.java | 36 ++----------------- .../github/lncvrt/lncvrtbox/commands/Fix.java | 18 ++++++++-- .../lncvrt/lncvrtbox/commands/Lockchat.java | 3 -- .../lncvrt/lncvrtbox/commands/Rules.java | 3 +- src/main/resources/plugin.yml | 3 +- 6 files changed, 22 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 7d86fa9..d2ece79 100644 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,6 @@ 2.20.1 provided - - net.luckperms - api - 5.4 - provided - me.clip placeholderapi diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java index 65077e4..9364f7f 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java @@ -3,12 +3,6 @@ package io.github.lncvrt.lncvrtbox; import com.earth2me.essentials.Essentials; import io.github.lncvrt.lncvrtbox.commands.*; import io.github.lncvrt.lncvrtbox.events.*; -import net.luckperms.api.LuckPerms; -import net.luckperms.api.LuckPermsProvider; -import net.luckperms.api.model.user.User; -import net.luckperms.api.node.Node; -import net.luckperms.api.node.NodeType; -import net.luckperms.api.node.types.SuffixNode; import org.bukkit.*; import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; @@ -29,11 +23,11 @@ import java.util.logging.Level; public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor { - private LuckPerms luckPerms; public final Map autoCompressStatus = new HashMap<>(); public String serverRules; public boolean chatLocked = false; private Essentials essentials; + public boolean fixRanTooOften = false; @Override public void onEnable() { @@ -42,14 +36,6 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor getServer().getPluginManager().disablePlugin(this); return; } - if (Bukkit.getPluginManager().getPlugin("LuckPerms") != null) { - luckPerms = LuckPermsProvider.get(); - getLogger().info("LuckPerms detected and hooked."); - } else { - getLogger().warning("LuckPerms not found. Disabling plugin."); - getServer().getPluginManager().disablePlugin(this); - return; - } if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") == null) { getLogger().warning("PlaceholderAPI not found. Disabling plugin."); getServer().getPluginManager().disablePlugin(this); @@ -112,7 +98,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor loadServerRules(); Objects.requireNonNull(getCommand("autocompress")).setExecutor(new Autocompress(this)); Objects.requireNonNull(getCommand("clearchat")).setExecutor(new Clearchat()); - Objects.requireNonNull(getCommand("fix")).setExecutor(new Fix()); + Objects.requireNonNull(getCommand("fix")).setExecutor(new Fix(this)); Objects.requireNonNull(getCommand("link")).setExecutor(new Link()); Objects.requireNonNull(getCommand("lockchat")).setExecutor(new Lockchat(this)); Objects.requireNonNull(getCommand("rules")).setExecutor(new Rules(this)); @@ -264,22 +250,4 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor com.earth2me.essentials.User user = essentials.getUser(player); return user.isMuted(); } - - private void setSuffix(Player player, String suffix) { - User user = luckPerms.getUserManager().getUser(player.getUniqueId()); - if (user != null) { - Node suffixNode = SuffixNode.builder(" " + suffix, 1).build(); - user.data().clear(NodeType.SUFFIX::matches); - user.data().add(suffixNode); - luckPerms.getUserManager().saveUser(user); - } - } - - private void removeSuffix(Player player) { - User user = luckPerms.getUserManager().getUser(player.getUniqueId()); - if (user != null) { - user.data().clear(NodeType.SUFFIX::matches); - luckPerms.getUserManager().saveUser(user); - } - } } \ No newline at end of file diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java index f86d3e2..a350b0b 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java @@ -8,20 +8,34 @@ import com.sk89q.worldedit.function.pattern.RandomPattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.block.BlockState; +import io.github.lncvrt.lncvrtbox.LncvrtBox; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import java.util.Objects; + public class Fix implements CommandExecutor { + private final LncvrtBox plugin; + + public Fix(LncvrtBox plugin) { + this.plugin = plugin; + } @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { //TODO: make selectionwall4 (front wall) - com.sk89q.worldedit.world.World world = BukkitAdapter.adapt(Bukkit.getWorld("world")); + if (plugin.fixRanTooOften) { + sender.sendMessage("/fix was ran within the past 5 seconds!"); + return true; + } + plugin.fixRanTooOften = true; + plugin.getServer().getScheduler().runTaskLater(plugin, () -> plugin.fixRanTooOften = false, 20 * 5); + + com.sk89q.worldedit.world.World world = BukkitAdapter.adapt(Objects.requireNonNull(Bukkit.getWorld("world"))); CuboidRegion selectionground1 = new CuboidRegion(world, BlockVector3.at(131, 100, 105), BlockVector3.at(-67, 100, -123)); CuboidRegion selectionwall1 = new CuboidRegion(world, BlockVector3.at(-66, 139, 105), BlockVector3.at(130, 101, 105)); CuboidRegion selectionwall2 = new CuboidRegion(world, BlockVector3.at(-67, 139, 104), BlockVector3.at(-67, 101, -122)); diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java index 664b726..51a34c1 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java @@ -6,9 +6,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import static org.bukkit.ChatColor.RED; -import static org.bukkit.ChatColor.translateAlternateColorCodes; - public record Lockchat(LncvrtBox plugin) implements CommandExecutor { @Override diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java index b5593d3..8ead728 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java @@ -6,7 +6,8 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import static org.bukkit.ChatColor.*; +import static org.bukkit.ChatColor.RED; +import static org.bukkit.ChatColor.translateAlternateColorCodes; public record Rules(LncvrtBox plugin) implements CommandExecutor { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 700b0c3..5e9dbdb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,8 +4,9 @@ main: io.github.lncvrt.lncvrtbox.LncvrtBox api-version: '1.20' depend: - PlaceholderAPI - - LuckPerms - Essentials + - WorldEdit + - WorldGuard commands: autocompress: description: Auto compressor