/fix cooldown, and removed luckperms dependency (unused)

This commit is contained in:
2024-07-15 01:33:44 -07:00
parent 3c63ef1fe9
commit c591a1c235
6 changed files with 22 additions and 47 deletions

View File

@@ -78,12 +78,6 @@
<version>2.20.1</version> <version>2.20.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.4</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId> <artifactId>placeholderapi</artifactId>

View File

@@ -3,12 +3,6 @@ package io.github.lncvrt.lncvrtbox;
import com.earth2me.essentials.Essentials; import com.earth2me.essentials.Essentials;
import io.github.lncvrt.lncvrtbox.commands.*; import io.github.lncvrt.lncvrtbox.commands.*;
import io.github.lncvrt.lncvrtbox.events.*; 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.*;
import org.bukkit.command.TabExecutor; import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -29,11 +23,11 @@ import java.util.logging.Level;
public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor { public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor {
private LuckPerms luckPerms;
public final Map<UUID, Boolean> autoCompressStatus = new HashMap<>(); public final Map<UUID, Boolean> autoCompressStatus = new HashMap<>();
public String serverRules; public String serverRules;
public boolean chatLocked = false; public boolean chatLocked = false;
private Essentials essentials; private Essentials essentials;
public boolean fixRanTooOften = false;
@Override @Override
public void onEnable() { public void onEnable() {
@@ -42,14 +36,6 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return; 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) { if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") == null) {
getLogger().warning("PlaceholderAPI not found. Disabling plugin."); getLogger().warning("PlaceholderAPI not found. Disabling plugin.");
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
@@ -112,7 +98,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor
loadServerRules(); loadServerRules();
Objects.requireNonNull(getCommand("autocompress")).setExecutor(new Autocompress(this)); Objects.requireNonNull(getCommand("autocompress")).setExecutor(new Autocompress(this));
Objects.requireNonNull(getCommand("clearchat")).setExecutor(new Clearchat()); 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("link")).setExecutor(new Link());
Objects.requireNonNull(getCommand("lockchat")).setExecutor(new Lockchat(this)); Objects.requireNonNull(getCommand("lockchat")).setExecutor(new Lockchat(this));
Objects.requireNonNull(getCommand("rules")).setExecutor(new Rules(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); com.earth2me.essentials.User user = essentials.getUser(player);
return user.isMuted(); 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);
}
}
} }

View File

@@ -8,20 +8,34 @@ import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import io.github.lncvrt.lncvrtbox.LncvrtBox;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class Fix implements CommandExecutor { public class Fix implements CommandExecutor {
private final LncvrtBox plugin;
public Fix(LncvrtBox plugin) {
this.plugin = plugin;
}
@Override @Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
//TODO: make selectionwall4 (front wall) //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 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 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)); CuboidRegion selectionwall2 = new CuboidRegion(world, BlockVector3.at(-67, 139, 104), BlockVector3.at(-67, 101, -122));

View File

@@ -6,9 +6,6 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static org.bukkit.ChatColor.RED;
import static org.bukkit.ChatColor.translateAlternateColorCodes;
public record Lockchat(LncvrtBox plugin) implements CommandExecutor { public record Lockchat(LncvrtBox plugin) implements CommandExecutor {
@Override @Override

View File

@@ -6,7 +6,8 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; 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 { public record Rules(LncvrtBox plugin) implements CommandExecutor {

View File

@@ -4,8 +4,9 @@ main: io.github.lncvrt.lncvrtbox.LncvrtBox
api-version: '1.20' api-version: '1.20'
depend: depend:
- PlaceholderAPI - PlaceholderAPI
- LuckPerms
- Essentials - Essentials
- WorldEdit
- WorldGuard
commands: commands:
autocompress: autocompress:
description: Auto compressor description: Auto compressor