diff --git a/pom.xml b/pom.xml index 31ec9a3..b1b4eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - io.github.lncvrt - LncvrtBox - LncvrtBox + xyz.lncvrt + GalaxyBoxPvP + GalaxyBoxPvP 1.0.0 @@ -73,13 +73,13 @@ io.papermc.paper paper-api - 1.20.6-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT provided net.essentialsx EssentialsX - 2.20.1 + 2.21.0 provided @@ -97,7 +97,7 @@ com.sk89q.worldguard worldguard-bukkit - 7.1.0-SNAPSHOT + 7.0.13 provided diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/PlaceholderAPIExpansion.java b/src/main/java/io/github/lncvrt/lncvrtbox/PlaceholderAPIExpansion.java deleted file mode 100644 index 47673ed..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/PlaceholderAPIExpansion.java +++ /dev/null @@ -1,179 +0,0 @@ -package io.github.lncvrt.lncvrtbox; - -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.User; -import me.clip.placeholderapi.PlaceholderAPI; -import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.Locale; - -import static org.bukkit.ChatColor.*; - -public final class PlaceholderAPIExpansion extends PlaceholderExpansion { - - private Essentials essentials; - - @Override - public @NotNull String getIdentifier() { - return "lncvrtbox"; - } - - @Override - public @NotNull String getAuthor() { - return "Lncvrt"; - } - - @Override - public @NotNull String getVersion() { - return "1.0.0"; - } - - @Override - public boolean persist() { - return true; - } - - @Override - public boolean canRegister() { - return true; - } - - @Override - public boolean register() { - Plugin essentialsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Essentials"); - if (essentialsPlugin instanceof Essentials) { - this.essentials = (Essentials) essentialsPlugin; - return super.register(); - } - return false; - } - - @Override - public @Nullable String onPlaceholderRequest(Player player, @NotNull String identifier) { - if (essentials == null) { - return null; - } - - int decimalPlaces = 1; - if (identifier.matches("(health|hearts)_\\d+")) { - try { - decimalPlaces = Integer.parseInt(identifier.split("_")[1]); - } catch (NumberFormatException | ArrayIndexOutOfBoundsException ignored) { - } - identifier = identifier.split("_")[0]; - } - - switch (identifier) { - case "afk" -> { - int afkCount = 0; - for (Player p : Bukkit.getServer().getOnlinePlayers()) { - User user = essentials.getUser(p); - if (user != null && user.isAfk()) { - afkCount++; - } - } - return String.valueOf(afkCount); - } - case "afk_staff" -> { - int staffAfkCount = 0; - for (Player p : Bukkit.getServer().getOnlinePlayers()) { - if (p.hasPermission("lncvrtbox.staff") && isAfk(p)) { - staffAfkCount++; - } - } - return String.valueOf(staffAfkCount); - } - case "team" -> { - String team = PlaceholderAPI.setPlaceholders(player, "%betterteams_displayname%"); - if (team.isEmpty()) { - return ""; - } else { - return "%s[%s%s%s%s]%s ".formatted(GRAY, RESET, team, RESET, GRAY, RESET); - } - } - case "health" -> { - double health = player.getHealth(); - String format = decimalPlaces > 0 ? "#." + repeat("0", decimalPlaces) : "#"; - return new DecimalFormat(format).format(health); - } - case "hearts" -> { - double hearts = player.getHealth() / 2.0; - String format = decimalPlaces > 0 ? "#." + repeat("0", decimalPlaces) : "#"; - return new DecimalFormat(format).format(hearts); - } - case "total_joins" -> { - NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US); - return numberFormat.format(Bukkit.getOfflinePlayers().length); - } - case "total_joins_formatted" -> { - return formatCompact(Bukkit.getOfflinePlayers().length); - } - case "kdr" -> { - int kills = getPlayerKills(player); - int deaths = getPlayerDeaths(player); - double kdr = (deaths == 0) ? kills : (double) kills / deaths; - String format = decimalPlaces > 0 ? "0." + repeat("0", decimalPlaces) : "0"; - return new DecimalFormat(format).format(kdr); - } - case "playtime" -> { - long playtimeTicks = player.getStatistic(org.bukkit.Statistic.PLAY_ONE_MINUTE); - long playtimeSeconds = playtimeTicks / 20; - return formatTime(playtimeSeconds); - } - } - - return null; - } - - private String repeat(String str, int count) { - return String.valueOf(str).repeat(Math.max(0, count)); - } - - private boolean isAfk(Player player) { - User user = essentials.getUser(player); - return user != null && user.isAfk(); - } - - private String formatCompact(int number) { - DecimalFormat decimalFormat = new DecimalFormat("#.#"); - if (number >= 1_000_000) { - return decimalFormat.format(number / 1_000_000.0) + "M"; - } else if (number >= 1_000) { - return decimalFormat.format(number / 1_000.0) + "k"; - } else { - return String.valueOf(number); - } - } - - private String formatTime(long seconds) { - long days = seconds / 86400; - seconds %= 86400; - long hours = seconds / 3600; - seconds %= 3600; - long minutes = seconds / 60; - seconds %= 60; - - StringBuilder formattedTime = new StringBuilder(); - if (days > 0) formattedTime.append(days).append(" days, "); - if (hours > 0 || days > 0) formattedTime.append(hours).append(" hours, "); - if (minutes > 0 || hours > 0 || days > 0) formattedTime.append(minutes).append(" minutes, "); - formattedTime.append(seconds).append(" seconds"); - - return formattedTime.toString().trim(); - } - - public int getPlayerKills(Player player) { - return player.getStatistic(org.bukkit.Statistic.PLAYER_KILLS); - } - - public int getPlayerDeaths(Player player) { - return player.getStatistic(org.bukkit.Statistic.DEATHS); - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Clearchat.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Clearchat.java deleted file mode 100644 index e99c41d..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Clearchat.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -import org.bukkit.Bukkit; -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 static org.bukkit.ChatColor.RED; - -public class Clearchat implements CommandExecutor { - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (sender instanceof Player player) { - if (!player.hasPermission("lncvrtbox.clearchat")) { - player.sendMessage("%sYou do not have permission to use this command.".formatted(RED)); - return true; - } - } - - for (int i = 0; i < 1000; i++) { - Bukkit.broadcastMessage(""); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java deleted file mode 100644 index a350b0b..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Fix.java +++ /dev/null @@ -1,100 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -import com.sk89q.worldedit.EditSession; -import com.sk89q.worldedit.MaxChangedBlocksException; -import com.sk89q.worldedit.WorldEdit; -import com.sk89q.worldedit.bukkit.BukkitAdapter; -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.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) - 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)); - CuboidRegion selectionwall3 = new CuboidRegion(world, BlockVector3.at(-67, 139, -123), BlockVector3.at(130, 101, -123)); - - try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1)) { - RandomPattern pat = new RandomPattern(); - BlockState deepslate_tiles = BukkitAdapter.adapt(Material.DEEPSLATE_TILES.createBlockData()); - BlockState deepslate_bricks = BukkitAdapter.adapt(Material.DEEPSLATE_BRICKS.createBlockData()); - pat.add(deepslate_tiles, 0.5); - pat.add(deepslate_bricks, 0.5); - - editSession.setBlocks(selectionground1, pat); - } catch (MaxChangedBlocksException ex) { - ex.printStackTrace(); - } - - try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1)) { - RandomPattern pat = new RandomPattern(); - BlockState gold_block = BukkitAdapter.adapt(Material.GOLD_BLOCK.createBlockData()); - BlockState raw_gold_block = BukkitAdapter.adapt(Material.RAW_GOLD_BLOCK.createBlockData()); - BlockState yellow_concrete = BukkitAdapter.adapt(Material.YELLOW_CONCRETE.createBlockData()); - pat.add(gold_block, 0.33333333333); - pat.add(raw_gold_block, 0.33333333333); - pat.add(yellow_concrete, 0.33333333333); - - editSession.setBlocks(selectionwall1, pat); - } catch (MaxChangedBlocksException ex) { - ex.printStackTrace(); - } - - try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1)) { - RandomPattern pat = new RandomPattern(); - BlockState lapis_block = BukkitAdapter.adapt(Material.LAPIS_BLOCK.createBlockData()); - BlockState blue_concrete_powder = BukkitAdapter.adapt(Material.BLUE_CONCRETE_POWDER.createBlockData()); - BlockState blue_concrete = BukkitAdapter.adapt(Material.BLUE_CONCRETE.createBlockData()); - pat.add(lapis_block, 0.33333333333); - pat.add(blue_concrete_powder, 0.33333333333); - pat.add(blue_concrete, 0.33333333333); - - editSession.setBlocks(selectionwall2, pat); - } catch (MaxChangedBlocksException ex) { - ex.printStackTrace(); - } - - try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1)) { - RandomPattern pat = new RandomPattern(); - BlockState lime_concrete = BukkitAdapter.adapt(Material.LIME_CONCRETE.createBlockData()); - BlockState melon = BukkitAdapter.adapt(Material.MELON.createBlockData()); - BlockState green_glazed_terracotta = BukkitAdapter.adapt(Material.GREEN_GLAZED_TERRACOTTA.createBlockData()); - pat.add(lime_concrete, 0.33333333333); - pat.add(melon, 0.33333333333); - pat.add(green_glazed_terracotta, 0.33333333333); - - editSession.setBlocks(selectionwall3, pat); - } catch (MaxChangedBlocksException ex) { - ex.printStackTrace(); - } - sender.sendMessage("fixed!"); - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Link.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Link.java deleted file mode 100644 index c58fc36..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Link.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -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; - -public class Link implements CommandExecutor { - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (sender instanceof Player player) { - player.performCommand("discord link"); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java deleted file mode 100644 index 51a34c1..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Lockchat.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; - -public record Lockchat(LncvrtBox plugin) implements CommandExecutor { - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (sender.hasPermission("chatlock.lock")) { - plugin.chatLocked = !plugin.chatLocked; - sender.sendMessage("Chat " + (plugin.chatLocked ? "locked." : "unlocked.")); - } else { - sender.sendMessage("You do not have permission to use this command."); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Ping.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Ping.java deleted file mode 100644 index efd449e..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Ping.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.ChatColor; -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 static org.bukkit.ChatColor.*; - -public class Ping implements CommandExecutor { - private final LncvrtBox plugin; - - public Ping(LncvrtBox plugin) { - this.plugin = plugin; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (sender instanceof Player player) { - String targetName = (args.length > 0 && args[0] != null && !args[0].isEmpty() && !args[0].equals("!")) ? args[0].replaceAll("\\.[^a-zA-Z0-9_]", "").substring(0, Math.min(args[0].replaceAll("[^a-zA-Z0-9_]", "").length(), 16)) : player.getName(); - Player target = player; - - if (!targetName.equalsIgnoreCase(player.getName())) { - target = plugin.getServer().getPlayer(targetName); - if (target == null) { - player.sendMessage(String.format("%s%s%s is not online!", RED, targetName, GRAY)); - return true; - } - } - - targetName = target.getName(); - int ping = target.getPing(); - ChatColor color; - - if (ping < 79) { - color = GREEN; - } else if (ping < 150) { - color = YELLOW; - } else { - color = RED; - } - - player.sendMessage(String.format("%s%s%s's ping is: %s%s%sms", RED, targetName, GRAY, color, ping, GRAY)); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java deleted file mode 100644 index 8ead728..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Rules.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.command.Command; -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 Rules(LncvrtBox plugin) implements CommandExecutor { - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (plugin.serverRules != null && !plugin.serverRules.isEmpty()) { - sender.sendMessage(translateAlternateColorCodes('&', plugin.serverRules)); - } else { - sender.sendMessage("%sServer rules are currently unavailable.".formatted(RED)); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Unlink.java b/src/main/java/io/github/lncvrt/lncvrtbox/commands/Unlink.java deleted file mode 100644 index 983abc1..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Unlink.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.github.lncvrt.lncvrtbox.commands; - -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; - -public class Unlink implements CommandExecutor { - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (sender instanceof Player player) { - player.performCommand("discord link"); - } - return true; - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockBreakListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockBreakListener.java deleted file mode 100644 index 7cd9c50..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockBreakListener.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.entity.ExperienceOrb; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockBreakEvent; - -import java.util.Random; - -public class BlockBreakListener implements Listener { - private final LncvrtBox plugin; - private final Random random = new Random(); - - public BlockBreakListener(LncvrtBox plugin) { - this.plugin = plugin; - } - - @EventHandler(priority = EventPriority.LOWEST) - public void onBlockBreak(BlockBreakEvent event) { - Player player = event.getPlayer(); - plugin.convertInventoryItemsPrep(player, player.getUniqueId()); - if (event.getBlock().getType() == Material.SPAWNER) { - int exp = random.nextInt(29) + 15; - - Location blockLocation = event.getBlock().getLocation(); - ExperienceOrb orb = blockLocation.getWorld().spawn(blockLocation, ExperienceOrb.class); - orb.setExperience(exp); - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java deleted file mode 100644 index d84a5ef..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; - -import static org.bukkit.ChatColor.*; - -public class EntityDamageListener implements Listener { - private final LncvrtBox plugin; - - public EntityDamageListener(LncvrtBox plugin) { - this.plugin = plugin; - } - - @EventHandler - private void onPlayerDamage(EntityDamageEvent event) { - if (event.getEntity() instanceof Player player) { - if (plugin.isAfk(player)) { - event.setCancelled(true); - if (event instanceof EntityDamageByEntityEvent damageEvent) { - if (damageEvent.getDamager() instanceof Player attacker) { - attacker.sendMessage("%s%sLncvrtBox %s%s» %sYou can't attack AFK players!".formatted(GOLD, BOLD, GRAY, BOLD, RESET)); - player.sendMessage("%s%sLncvrtBox %s%s» %s%s tried to attack you while you were AFK!".formatted(GOLD, BOLD, GRAY, BOLD, RESET, attacker.getName())); - if (attacker.getNoDamageTicks() <= 10) { - attacker.damage(0.0001); - attacker.setVelocity(attacker.getLocation().toVector().subtract(player.getLocation().toVector()).normalize().setY(0.5).multiply(0.5)); - } - } - } - } - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java deleted file mode 100644 index aa3e0eb..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import net.kyori.adventure.text.minimessage.MiniMessage; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityResurrectEvent; - -public class EntityResurrectListener implements Listener { - private final LncvrtBox plugin; - - public EntityResurrectListener(LncvrtBox plugin) { - this.plugin = plugin; - } - - @EventHandler - public void onEntityResurrect(EntityResurrectEvent event) { - if (event.getEntity() instanceof Player player && !event.isCancelled()) { - if (player.getInventory().getItemInMainHand().getType() == Material.TOTEM_OF_UNDYING || player.getInventory().getItemInOffHand().getType() == Material.TOTEM_OF_UNDYING) { - if (player.getCooldown(Material.TOTEM_OF_UNDYING) != 0) { - event.setCancelled(true); - return; - } - player.setCooldown(Material.TOTEM_OF_UNDYING, 20 * 5); - plugin.getServer().broadcast(MiniMessage.miniMessage().deserialize("LncvrtBox » " + player.getName() + " has popped their totem")); - } - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerChatListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerChatListener.java deleted file mode 100644 index 9fe0672..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerChatListener.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; - -import java.util.Base64; - -import static org.bukkit.ChatColor.*; - -public class PlayerChatListener implements Listener { - private final LncvrtBox plugin; - - public PlayerChatListener(LncvrtBox plugin) { - this.plugin = plugin; - } - - @EventHandler - public void onPlayerChat(AsyncPlayerChatEvent event) { - String message = event.getMessage().replaceAll("[^a-zA-Z0-9\\p{Punct}\\s]", "").replaceAll("\\s+", " ").trim(); - Player player = event.getPlayer(); - - String[] slurs = {"bmlnZ2Vy", "bmlnZ2E="}; - - event.setMessage(message); - - if (plugin.chatLocked && !player.hasPermission("chatlock.bypass")) { - event.setCancelled(true); - player.sendMessage("Chat is currently locked. Admins can still view your message."); - for (Player admin : Bukkit.getServer().getOnlinePlayers()) { - if (admin.hasPermission("chatlock.admin")) { - admin.sendMessage("%s%s%s tried to say: %s".formatted(GRAY, ITALIC, player.getName(), event.getMessage())); - } - } - } - - for (String slur : slurs) { - if (message.toLowerCase().contains(new String(Base64.getDecoder().decode(slur)))) { - player.chat("Oops! I'm now banned because I said a slur."); - - plugin.getServer().dispatchCommand(Bukkit.getConsoleSender(), "tempbanip %s 1w Slurs".formatted(player.getName())); - plugin.getServer().dispatchCommand(Bukkit.getConsoleSender(), "tempban %s 1w Slurs".formatted(player.getName())); - plugin.getServer().dispatchCommand(Bukkit.getConsoleSender(), "mute %s 1mo Slurs".formatted(player.getName())); - - event.setCancelled(true); - break; - } - } - - if (message.toLowerCase().contains("minehut.gg")) { - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tempbanip %s 1m Advertising".formatted(player.getName())); - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tempban %s 1m Advertising".formatted(player.getName())); - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "mute %s 3m Advertising".formatted(player.getName())); - event.setCancelled(true); - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java deleted file mode 100644 index bd4ef80..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import net.kyori.adventure.text.minimessage.MiniMessage; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.PlayerDeathEvent; - -public class PlayerDeathListener implements Listener { - @EventHandler - public void onPlayerDeath(PlayerDeathEvent event) { - event.deathMessage(MiniMessage.miniMessage().deserialize("LncvrtBox » " + event.getDeathMessage())); - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerItemConsumeListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerItemConsumeListener.java deleted file mode 100644 index 2eca436..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerItemConsumeListener.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerItemConsumeEvent; -import org.bukkit.inventory.ItemStack; - -public class PlayerItemConsumeListener implements Listener { - @EventHandler - public void onPlayerItemConsume(PlayerItemConsumeEvent event) { - Player player = event.getPlayer(); - ItemStack item = event.getItem(); - - if (item.getType() == Material.GOLDEN_APPLE || item.getType() == Material.ENCHANTED_GOLDEN_APPLE) { - player.setCooldown(Material.GOLDEN_APPLE, 20 * 8); - player.setCooldown(Material.ENCHANTED_GOLDEN_APPLE, 20 * 16); - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerJoinListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerJoinListener.java deleted file mode 100644 index 803152f..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerJoinListener.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; - -import java.util.UUID; - -import static org.bukkit.ChatColor.*; - -public class PlayerJoinListener implements Listener { - private final LncvrtBox plugin; - - public PlayerJoinListener(LncvrtBox plugin) { - this.plugin = plugin; - } - - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event) { - Player player = event.getPlayer(); - UUID playerId = player.getUniqueId(); - - if (!plugin.autoCompressStatus.containsKey(playerId)) { - plugin.autoCompressStatus.put(playerId, false); - } - - player.getInventory().remove(Material.WITHER_SKELETON_SKULL); - - player.sendMessage("%s%sWe added %s%s%s/autocompress%s%s%s! Use that to compress diamonds into diamond blocks and more!".formatted(AQUA, BOLD, RESET, AQUA, UNDERLINE, RESET, AQUA, BOLD)); - player.sendMessage("%s%sYou can also do %s%s%s/settag%s%s%s to customize your suffix/tag (issues related to that have been fixed)".formatted(GREEN, BOLD, RESET, GREEN, UNDERLINE, RESET, GREEN, BOLD)); - player.sendMessage("%s%sAlso make sure to join the Discord by doing %s%s%s/discord%s%s%s!".formatted(BLUE, BOLD, RESET, BLUE, UNDERLINE, RESET, BLUE, BOLD)); - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PortalCreateListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PortalCreateListener.java deleted file mode 100644 index 96e8b90..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PortalCreateListener.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.world.PortalCreateEvent; - -import java.util.Objects; - -public class PortalCreateListener implements Listener { - @EventHandler - public void onPortalCreate(PortalCreateEvent event) { - World.Environment env = event.getWorld().getEnvironment(); - if (env == World.Environment.NORMAL && event.getReason() != PortalCreateEvent.CreateReason.FIRE) { - event.setCancelled(true); - - for (Player player : Bukkit.getServer().getOnlinePlayers()) { - if (Objects.equals(event.getEntity(), player)) { - Location spawnLocation = Objects.requireNonNull(Bukkit.getServer().getWorld("world")).getSpawnLocation(); - player.teleport(spawnLocation); - break; - } - } - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java similarity index 84% rename from src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java index cca4af3..91965cd 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java @@ -1,32 +1,35 @@ -package io.github.lncvrt.lncvrtbox; +package xyz.lncvrt.galaxyboxpvp; import com.earth2me.essentials.Essentials; -import io.github.lncvrt.lncvrtbox.commands.*; -import io.github.lncvrt.lncvrtbox.events.*; -import org.bukkit.*; +import com.earth2me.essentials.User; +import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.bukkit.inventory.ItemStack; - -import org.bukkit.Bukkit; +import xyz.lncvrt.galaxyboxpvp.commands.Autocompress; +import xyz.lncvrt.galaxyboxpvp.commands.Sky; +import xyz.lncvrt.galaxyboxpvp.events.*; import java.io.*; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; import java.util.logging.Level; -public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor { +public final class GalaxyBoxPvP extends JavaPlugin implements Listener, TabExecutor { public final Map autoCompressStatus = new HashMap<>(); public String serverRules; - public boolean chatLocked = false; private Essentials essentials; - public boolean fixRanTooOften = false; + private final PlaceholderAPIExpansion placeholderAPIExpansion = new PlaceholderAPIExpansion(); @Override public void onEnable() { @@ -40,7 +43,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor getServer().getPluginManager().disablePlugin(this); } - if (new PlaceholderAPIExpansion().register()) { + if (placeholderAPIExpansion.register()) { getLogger().info("Successfully registered PlaceholderAPIExpansion!"); } else { getLogger().warning("Failed to register PlaceholderAPIExpansion. Disabling plugin."); @@ -57,24 +60,19 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor @Override public void onDisable() { + placeholderAPIExpansion.unregister(); saveAutoCompressStatus(); } private void registerEvents() { - getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this); getServer().getPluginManager().registerEvents(new BlockBreakListener(this), this); + getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this); getServer().getPluginManager().registerEvents(new CraftItemListener(), this); - getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this); getServer().getPluginManager().registerEvents(new EntityPickupItemListener(this), this); - getServer().getPluginManager().registerEvents(new EntityResurrectListener(this), this); getServer().getPluginManager().registerEvents(new FurnaceBurnListener(this), this); getServer().getPluginManager().registerEvents(new FurnaceSmeltListener(this), this); - getServer().getPluginManager().registerEvents(new PlayerChatListener(this), this); - getServer().getPluginManager().registerEvents(new PlayerDeathListener(), this); getServer().getPluginManager().registerEvents(new PlayerDropItemListener(this), this); - getServer().getPluginManager().registerEvents(new PlayerItemConsumeListener(), this); getServer().getPluginManager().registerEvents(new PlayerJoinListener(this), this); - getServer().getPluginManager().registerEvents(new PortalCreateListener(), this); getServer().getPluginManager().registerEvents(new PrepareAnvilListener(), this); getServer().getPluginManager().registerEvents(new PrepareItemEnchantListener(), this); getServer().getPluginManager().registerEvents(new ProjectileHitListener(), this); @@ -84,14 +82,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor private void registerCommands() { Objects.requireNonNull(getCommand("autocompress")).setExecutor(new Autocompress(this)); - Objects.requireNonNull(getCommand("clearchat")).setExecutor(new Clearchat()); - 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("ping")).setExecutor(new Ping(this)); - Objects.requireNonNull(getCommand("rules")).setExecutor(new Rules(this)); Objects.requireNonNull(getCommand("sky")).setExecutor(new Sky()); - Objects.requireNonNull(getCommand("unlink")).setExecutor(new Unlink()); } public boolean isRestrictedMaterial(Material material) { @@ -224,13 +215,8 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor } } - public boolean isAfk(Player player) { - com.earth2me.essentials.User user = essentials.getUser(player); - return user.isAfk(); - } - public boolean isMuted(Player player) { - com.earth2me.essentials.User user = essentials.getUser(player); + User user = essentials.getUser(player); return user.isMuted(); } } \ No newline at end of file diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/PlaceholderAPIExpansion.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/PlaceholderAPIExpansion.java new file mode 100644 index 0000000..5e0599e --- /dev/null +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/PlaceholderAPIExpansion.java @@ -0,0 +1,50 @@ +package xyz.lncvrt.galaxyboxpvp; + +import me.clip.placeholderapi.expansion.PlaceholderExpansion; +import org.bukkit.Statistic; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public final class PlaceholderAPIExpansion extends PlaceholderExpansion { + @Override + public @NotNull String getIdentifier() { + return "galaxyboxpvp"; + } + + @Override + public @NotNull String getAuthor() { + return "Lncvrt"; + } + + @Override + public @NotNull String getVersion() { + return "1.0.0"; + } + + @Override + public boolean persist() { + return true; + } + + @Override + public boolean canRegister() { + return true; + } + + @Override + public @Nullable String onPlaceholderRequest(Player player, @NotNull String identifier) { + switch (identifier) { + case "kills": + return String.valueOf(player.getStatistic(Statistic.PLAYER_KILLS)); + case "deaths": + return String.valueOf(player.getStatistic(Statistic.DEATHS)); + case "kdr": + int kills = player.getStatistic(Statistic.PLAYER_KILLS); + int deaths = player.getStatistic(Statistic.DEATHS); + return deaths == 0 ? String.valueOf(kills) : String.format("%.1f", (double) kills / deaths); + default: + return null; + } + } +} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Autocompress.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Autocompress.java similarity index 86% rename from src/main/java/io/github/lncvrt/lncvrtbox/commands/Autocompress.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Autocompress.java index d5b421b..620e569 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Autocompress.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Autocompress.java @@ -1,6 +1,6 @@ -package io.github.lncvrt.lncvrtbox.commands; +package xyz.lncvrt.galaxyboxpvp.commands; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -12,7 +12,7 @@ import java.util.UUID; import static org.bukkit.ChatColor.GREEN; import static org.bukkit.ChatColor.RED; -public record Autocompress(LncvrtBox plugin) implements CommandExecutor { +public record Autocompress(GalaxyBoxPvP plugin) implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Sky.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java similarity index 91% rename from src/main/java/io/github/lncvrt/lncvrtbox/commands/Sky.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java index 68ef90d..7a64a11 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/commands/Sky.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.commands; +package xyz.lncvrt.galaxyboxpvp.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockBreakListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockBreakListener.java new file mode 100644 index 0000000..a468403 --- /dev/null +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockBreakListener.java @@ -0,0 +1,21 @@ +package xyz.lncvrt.galaxyboxpvp.events; + +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockBreakEvent; + +public class BlockBreakListener implements Listener { + private final GalaxyBoxPvP plugin; + + public BlockBreakListener(GalaxyBoxPvP plugin) { + this.plugin = plugin; + } + + @EventHandler + public void onBlockBreak(BlockBreakEvent event) { + Player player = event.getPlayer(); + plugin.convertInventoryItemsPrep(player, player.getUniqueId()); + } +} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java similarity index 97% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java index 0d4c0c1..2c9d9a8 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/CraftItemListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/CraftItemListener.java similarity index 94% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/CraftItemListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/CraftItemListener.java index ad927c8..e3c95df 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/CraftItemListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/CraftItemListener.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; import org.bukkit.Material; import org.bukkit.event.EventHandler; diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityPickupItemListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/EntityPickupItemListener.java similarity index 75% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/EntityPickupItemListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/EntityPickupItemListener.java index e8db87b..ced0ac6 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityPickupItemListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/EntityPickupItemListener.java @@ -1,6 +1,6 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -8,9 +8,9 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityPickupItemEvent; public class EntityPickupItemListener implements Listener { - private final LncvrtBox plugin; + private final GalaxyBoxPvP plugin; - public EntityPickupItemListener(LncvrtBox plugin) { + public EntityPickupItemListener(GalaxyBoxPvP plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceBurnListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceBurnListener.java similarity index 78% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceBurnListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceBurnListener.java index 29ac88a..df4af45 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceBurnListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceBurnListener.java @@ -1,6 +1,6 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.Material; import org.bukkit.block.Furnace; import org.bukkit.event.EventHandler; @@ -10,9 +10,9 @@ import org.bukkit.event.inventory.FurnaceBurnEvent; import java.util.Objects; public class FurnaceBurnListener implements Listener { - private final LncvrtBox plugin; + private final GalaxyBoxPvP plugin; - public FurnaceBurnListener(LncvrtBox plugin) { + public FurnaceBurnListener(GalaxyBoxPvP plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceSmeltListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceSmeltListener.java similarity index 73% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceSmeltListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceSmeltListener.java index 9585153..0a8b33d 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/FurnaceSmeltListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/FurnaceSmeltListener.java @@ -1,15 +1,15 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.FurnaceSmeltEvent; public class FurnaceSmeltListener implements Listener { - private final LncvrtBox plugin; + private final GalaxyBoxPvP plugin; - public FurnaceSmeltListener(LncvrtBox plugin) { + public FurnaceSmeltListener(GalaxyBoxPvP plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDropItemListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerDropItemListener.java similarity index 72% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDropItemListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerDropItemListener.java index c6ca440..10a2239 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDropItemListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerDropItemListener.java @@ -1,15 +1,15 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerDropItemEvent; public class PlayerDropItemListener implements Listener { - private final LncvrtBox plugin; + private final GalaxyBoxPvP plugin; - public PlayerDropItemListener(LncvrtBox plugin) { + public PlayerDropItemListener(GalaxyBoxPvP plugin) { this.plugin = plugin; } diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerJoinListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerJoinListener.java new file mode 100644 index 0000000..9e7cf84 --- /dev/null +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PlayerJoinListener.java @@ -0,0 +1,31 @@ +package xyz.lncvrt.galaxyboxpvp.events; + +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +import java.util.UUID; + +import static org.bukkit.ChatColor.GREEN; + +public class PlayerJoinListener implements Listener { + private final GalaxyBoxPvP plugin; + + public PlayerJoinListener(GalaxyBoxPvP plugin) { + this.plugin = plugin; + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); + UUID playerId = player.getUniqueId(); + + if (!plugin.autoCompressStatus.containsKey(playerId)) { + plugin.autoCompressStatus.put(playerId, false); + } + + player.sendMessage("%sWelcome to LncvrtBox, %s! This is a PvP arena gamemode that was originally called LncvrtBox, and is almost a year old! We reset the server for GalaxyNetwork and a fresh start".formatted(GREEN, player.getName())); + } +} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareAnvilListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareAnvilListener.java similarity index 94% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareAnvilListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareAnvilListener.java index 0d25498..9a7a52b 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareAnvilListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareAnvilListener.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; import org.bukkit.Material; import org.bukkit.event.EventHandler; diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareItemEnchantListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareItemEnchantListener.java similarity index 92% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareItemEnchantListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareItemEnchantListener.java index 24d191f..a67d403 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PrepareItemEnchantListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/PrepareItemEnchantListener.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; import org.bukkit.Material; import org.bukkit.event.EventHandler; diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/ProjectileHitListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/ProjectileHitListener.java similarity index 94% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/ProjectileHitListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/ProjectileHitListener.java index 86de411..36612c6 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/ProjectileHitListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/ProjectileHitListener.java @@ -1,4 +1,4 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; import org.bukkit.entity.EntityType; import org.bukkit.entity.Projectile; diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/SignChangeListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/SignChangeListener.java similarity index 68% rename from src/main/java/io/github/lncvrt/lncvrtbox/events/SignChangeListener.java rename to src/main/java/xyz/lncvrt/galaxyboxpvp/events/SignChangeListener.java index 0010adf..e91c2b2 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/SignChangeListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/SignChangeListener.java @@ -1,14 +1,14 @@ -package io.github.lncvrt.lncvrtbox.events; +package xyz.lncvrt.galaxyboxpvp.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; +import xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.SignChangeEvent; public class SignChangeListener implements Listener { - private final LncvrtBox plugin; + private final GalaxyBoxPvP plugin; - public SignChangeListener(LncvrtBox plugin) { + public SignChangeListener(GalaxyBoxPvP plugin) { this.plugin = plugin; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5552cc5..8673f05 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ -name: LncvrtBox +name: GalaxyBoxPvP version: '${version}' -main: io.github.lncvrt.lncvrtbox.LncvrtBox -api-version: '1.20' +main: xyz.lncvrt.galaxyboxpvp.GalaxyBoxPvP +api-version: '1.21' depend: - PlaceholderAPI - Essentials @@ -11,31 +11,6 @@ commands: autocompress: description: Auto compressor usage: /autocompress - clearchat: - description: Clears chat - usage: /clearchat - aliases: - - cc - permission: lncvrtbox.clearchat - fix: - description: fix - permission: lncvrtbox.admin - usage: /fix - link: - description: Links your discord - usage: /link - lockchat: - description: Lockchat - usage: /lockchat - ping: - description: Shows your ping - usage: /ping [player] - rules: - description: Rules - usage: /rules sky: description: Teleports you to sky world - usage: /sky - unlink: - description: Unlinks your discord - usage: /unlink \ No newline at end of file + usage: /sky \ No newline at end of file