Reformat and update Gradle

build.gradle.kts

@@ -8,9 +8,10 @@ repositories {
         url = uri("https://repo.papermc.io/repository/maven-public/")
     }
 
-    /*maven {
+    maven {
         url = uri("https://nexus.telesphoreo.me/repository/plex/")
-    }*/
+    }
+
     maven {
         url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
     }
@@ -31,7 +32,7 @@ dependencies {
 }
 
 group = "dev.plex"
-version = "1.3"
+version = "1.4-SNAPSHOT"
 description = "Module-TFMExtras"
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,11 +130,14 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

src/main/java/dev/plex/extras/TFMExtras.java

@@ -1,7 +1,6 @@
 package dev.plex.extras;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
 import com.google.common.reflect.ClassPath;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
@@ -10,28 +9,19 @@ import dev.plex.config.ModuleConfig;
 import dev.plex.extras.command.slime.MyWorldCommand;
 import dev.plex.extras.command.slime.SlimeManagerCommand;
 import dev.plex.extras.hook.SlimeWorldHook;
-import dev.plex.extras.hook.slime.PlayerWorld;
 import dev.plex.extras.jumppads.JumpPads;
 import dev.plex.listener.PlexListener;
-import dev.plex.listener.impl.ChatListener;
 import dev.plex.module.PlexModule;
-import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
-import dev.plex.util.PlexUtils;
-import dev.plex.util.minimessage.SafeMiniMessage;
-import dev.plex.util.sql.SQLUtil;
-import io.papermc.paper.event.player.AsyncChatEvent;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.Location;
-import org.bukkit.World;
-
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
+import lombok.Getter;
+import org.bukkit.Location;
+import org.bukkit.World;
 
 public class TFMExtras extends PlexModule
 {
@@ -68,7 +58,6 @@ public class TFMExtras extends PlexModule
         }
 
 
-
         getClassesFrom("dev.plex.extras.command").forEach(aClass ->
         {
             if (PlexCommand.class.isAssignableFrom(aClass) && aClass.isAnnotationPresent(CommandParameters.class) && aClass.isAnnotationPresent(CommandPermissions.class))

src/main/java/dev/plex/extras/command/AdminInfoCommand.java

@@ -1,10 +1,10 @@
 package dev.plex.extras.command;
 
-import dev.plex.extras.TFMExtras;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
+import dev.plex.extras.TFMExtras;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.CommandSender;
@@ -12,8 +12,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 @CommandParameters(name = "admininfo", description = "Information on how to apply for admin", aliases = "ai,si,staffinfo")
 @CommandPermissions(permission = "plex.tfmextras.admininfo")
 public class AdminInfoCommand extends PlexCommand

src/main/java/dev/plex/extras/command/AttributeListCommand.java

@@ -3,7 +3,7 @@ package dev.plex.extras.command;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
+import java.util.Arrays;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.attribute.Attribute;
@@ -12,8 +12,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-
 @CommandParameters(name = "attributes", description = "Lists all possible attributes", aliases = "attributelist,attrlist")
 @CommandPermissions(permission = "plex.tfmextras.attrlist")
 public class AttributeListCommand extends PlexCommand

src/main/java/dev/plex/extras/command/AutoClearCommand.java

@@ -1,21 +1,19 @@
 package dev.plex.extras.command;
 
-import dev.plex.extras.TFMExtras;
 import dev.plex.cache.DataUtils;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.PlayerNotFoundException;
+import dev.plex.extras.TFMExtras;
 import dev.plex.player.PlexPlayer;
-
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 @CommandParameters(name = "autoclear", description = "Toggle whether or not a player has their inventory automatically cleared when they join", usage = "/<command> <player>", aliases = "aclear,ac")
 @CommandPermissions(permission = "plex.tfmextras.autoclear")
 public class AutoClearCommand extends PlexCommand

src/main/java/dev/plex/extras/command/AutoTeleportCommand.java

@@ -1,13 +1,13 @@
 package dev.plex.extras.command;
 
-import dev.plex.extras.TFMExtras;
 import dev.plex.cache.DataUtils;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.PlayerNotFoundException;
+import dev.plex.extras.TFMExtras;
 import dev.plex.player.PlexPlayer;
-
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -15,8 +15,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 @CommandParameters(name = "autoteleport", description = "If a player is specified, it will toggle whether or not the player is automatically teleported when they join. If no player is specified, you will be randomly teleported", usage = "/<command> [player]", aliases = "autotp,rtp,randomtp,tpr")
 @CommandPermissions(permission = "plex.tfmextras.autotp")
 public class AutoTeleportCommand extends PlexCommand

src/main/java/dev/plex/extras/command/BanListCommand.java

@@ -4,6 +4,7 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.punishment.Punishment;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
@@ -11,8 +12,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.stream.Collectors;
-
 @CommandParameters(name = "banlist", description = "Manages the banlist", usage = "/<command> [purge]")
 @CommandPermissions(permission = "plex.tfmextras.banlist")
 public class BanListCommand extends PlexCommand

src/main/java/dev/plex/extras/command/CakeCommand.java

@@ -3,7 +3,6 @@ package dev.plex.extras.command;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
 import dev.plex.util.PlexUtils;
 import dev.plex.util.item.ItemBuilder;
 import net.kyori.adventure.text.Component;

src/main/java/dev/plex/extras/command/CartSitCommand.java

@@ -4,7 +4,9 @@ import dev.plex.Plex;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
@@ -15,10 +17,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
 @CommandParameters(name = "cartsit", description = "Sit in nearest minecart. If target is in a minecart already, they will be ejected", aliases = "minecartsit")
 @CommandPermissions(permission = "plex.tfmextras.cartsit")
 public class CartSitCommand extends PlexCommand

src/main/java/dev/plex/extras/command/ClearChatCommand.java

@@ -3,7 +3,6 @@ package dev.plex.extras.command;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
 import dev.plex.util.PlexUtils;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;

src/main/java/dev/plex/extras/command/CloudClearCommand.java

@@ -3,8 +3,9 @@ package dev.plex.extras.command;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
 import dev.plex.util.PlexUtils;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
@@ -15,9 +16,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.concurrent.atomic.AtomicInteger;
-
 @CommandParameters(name = "cloudclear", description = "Clears lingering potion area effect clouds", aliases = "clearcloud,aeclear")
 @CommandPermissions(permission = "plex.tfmextras.cloudclear")
 public class CloudClearCommand extends PlexCommand

src/main/java/dev/plex/extras/command/EjectCommand.java

@@ -4,7 +4,6 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.CommandSender;

src/main/java/dev/plex/extras/command/EnchantCommand.java

@@ -5,7 +5,8 @@ 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.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.apache.commons.lang3.StringUtils;
@@ -18,9 +19,6 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.List;
-
 @CommandParameters(name = "enchant", description = "Enchants an item", usage = "/<command> <add | reset | list | addall | remove>", aliases = "enchantment")
 @CommandPermissions(permission = "plex.tfmextras.enchant", source = RequiredCommandSource.IN_GAME)
 public class EnchantCommand extends PlexCommand

src/main/java/dev/plex/extras/command/EnglishMfCommand.java

@@ -3,8 +3,9 @@ package dev.plex.extras.command;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-
 import dev.plex.util.PlexUtils;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -13,9 +14,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * Credit to AcidicCyanide <3
  * Credit to "TheDeus-Group" for the messages :)

src/main/java/dev/plex/extras/command/JumpPadsCommand.java

@@ -1,14 +1,16 @@
 package dev.plex.extras.command;
 
-import dev.plex.extras.TFMExtras;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.extras.TFMExtras;
 import dev.plex.extras.jumppads.JumpPads;
 import dev.plex.extras.jumppads.Mode;
-
 import dev.plex.util.PlexUtils;
+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.bukkit.Bukkit;
@@ -18,10 +20,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 @CommandParameters(name = "jumppads", usage = "/jumppads <mode> [player]", description = "Enables jump pads for yourself or another player. Mode types available: none, regular, enhanced, extreme, ultimate", aliases = "jp,pads,launchpads")
 @CommandPermissions(permission = "plex.tfmextras.jumppads", source = RequiredCommandSource.ANY)
 public class JumpPadsCommand extends PlexCommand

src/main/java/dev/plex/extras/command/RandomFishCommand.java

@@ -4,7 +4,9 @@ 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.List;
+import java.util.concurrent.ThreadLocalRandom;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.block.Block;
@@ -14,10 +16,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-
 @CommandParameters(name = "randomfish", description = "Spawns a random type of fish at your location", aliases = "rfish,bird")
 @CommandPermissions(permission = "plex.tfmextras.randomfish", source = RequiredCommandSource.IN_GAME)
 public class RandomFishCommand extends PlexCommand

src/main/java/dev/plex/extras/command/slime/MyWorldCommand.java

@@ -6,7 +6,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.PlayerNotFoundException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.extras.TFMExtras;
-
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;

src/main/java/dev/plex/extras/command/slime/SlimeManagerCommand.java

@@ -5,7 +5,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.extras.TFMExtras;
-
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import io.papermc.paper.threadedregions.scheduler.ScheduledTask;

src/main/java/dev/plex/extras/hook/IHook.java

@@ -6,7 +6,8 @@ import dev.plex.extras.TFMExtras;
  * @author Taah
  * @since 2:16 PM [23-08-2023]
  */
-public interface IHook<T> {
+public interface IHook<T>
+{
 
     void onEnable(TFMExtras module);
 

src/main/java/dev/plex/extras/hook/SlimeWorldHook.java

@@ -2,13 +2,21 @@ package dev.plex.extras.hook;
 
 import com.google.common.collect.Sets;
 import com.infernalsuite.aswm.api.SlimePlugin;
-import com.infernalsuite.aswm.api.exceptions.*;
+import com.infernalsuite.aswm.api.exceptions.CorruptedWorldException;
+import com.infernalsuite.aswm.api.exceptions.NewerFormatException;
+import com.infernalsuite.aswm.api.exceptions.UnknownWorldException;
+import com.infernalsuite.aswm.api.exceptions.WorldAlreadyExistsException;
+import com.infernalsuite.aswm.api.exceptions.WorldLockedException;
 import com.infernalsuite.aswm.api.loaders.SlimeLoader;
 import com.infernalsuite.aswm.api.world.SlimeWorld;
 import com.infernalsuite.aswm.api.world.properties.SlimeProperties;
 import com.infernalsuite.aswm.api.world.properties.SlimePropertyMap;
 import dev.plex.extras.TFMExtras;
 import dev.plex.util.PlexLog;
+import java.io.IOException;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 import lombok.Getter;
 import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.Bukkit;
@@ -17,12 +25,6 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.event.world.WorldLoadEvent;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * @author Taah
  * @since 2:19 PM [23-08-2023]
@@ -86,7 +88,8 @@ public class SlimeWorldHook implements IHook<SlimePlugin>
                     this.plugin().loadWorld(world);
                     this.loader.unlockWorld(s);
                 }
-                catch (UnknownWorldException | WorldLockedException | CorruptedWorldException | NewerFormatException  | IllegalArgumentException ex)
+                catch (UnknownWorldException | WorldLockedException | CorruptedWorldException | NewerFormatException |
+                       IllegalArgumentException ex)
                 {
                     PlexLog.error(ex.getMessage());
                 }

src/main/java/dev/plex/extras/hook/slime/PlayerWorld.java

@@ -1,15 +1,11 @@
 package dev.plex.extras.hook.slime;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import dev.plex.storage.annotation.PrimaryKey;
 import dev.plex.storage.annotation.SQLTable;
-import lombok.Data;
-import org.bukkit.GameRule;
-
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
+import lombok.Data;
 
 /**
  * @author Taah

src/main/java/dev/plex/extras/jumppads/JumpPads.java

@@ -1,6 +1,10 @@
 package dev.plex.extras.jumppads;
 
 import dev.plex.extras.TFMExtras;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import org.bukkit.Material;
 import org.bukkit.Tag;
 import org.bukkit.block.Block;
@@ -8,11 +12,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
-
 public class JumpPads
 {
     public final Map<UUID, Mode> playerModeMap = new HashMap<>();

src/main/java/dev/plex/extras/listener/JumpPadsListener.java

@@ -5,6 +5,7 @@ import dev.plex.extras.jumppads.JumpPads;
 import dev.plex.extras.jumppads.Mode;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexLog;
+import java.util.Map;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
@@ -14,8 +15,6 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.Vector;
 
-import java.util.Map;
-
 public class JumpPadsListener extends PlexListener
 {
     JumpPads jumpPads = TFMExtras.getModule().jumpPads;

src/main/java/dev/plex/extras/listener/PlayerListener.java

@@ -4,10 +4,7 @@ import dev.plex.Plex;
 import dev.plex.extras.TFMExtras;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexLog;
-import dev.plex.util.PlexUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;

src/main/resources/module.yml

@@ -1,4 +1,4 @@
 name: Module-TFMExtras
 main: dev.plex.extras.TFMExtras
 description: TFM extras for Plex
-version: 1.3
+version: 1.4-SNAPSHOT