Fishnets and Baubles

Author: Paldiu

build.gradle

@@ -23,8 +23,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.projectlombok:lombok:1.18.20'
-    implementation 'org.postgresql:postgresql:42.2.20'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'com.github.Milkbowl:VaultAPI:1.7.1'
     implementation 'com.google.code.gson:gson:2.8.7'

build/resources/main/config.yml

@@ -0,0 +1,14 @@
+# The SQL driver to use.
+driver=jdbc
+# The type of database to use.
+databaseType=mysql
+# The database host.
+host=localhost
+# The database port.
+port=5432
+# The database file name.
+databaseFile=database.db
+# The database username.
+username=admin
+# The database password.
+password=default

build/resources/main/db.properties

@@ -0,0 +1,10 @@
+name: Traverse
+version: '1.0.0'
+main: mc.unraveled.reforged.plugin.Traverse
+api-version: 1.19
+authors: [ SimplexDevelopment ]
+description: "A plugin designed for the Unraveled: Reforged server."
+website: https://github.com/SimplexDevelopment/Traverse
+depend: [ Vault ]
+softdepend: [ EssentialsX, EssentialsXSpawn ]
+

build/resources/main/plugin.yml

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: reactor-core-3.4.10.jar reactive-streams-1.0.3.jar
+

build/tmp/compileJava/previous-compilation-data.bin

@@ -1,13 +1,12 @@
 package mc.unraveled.reforged.banning;
 
-import lombok.Getter;
 import mc.unraveled.reforged.api.Serializable;
 import mc.unraveled.reforged.util.Pair;
 import mc.unraveled.reforged.util.Utilities;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-@Getter
 public abstract class AbstractBan implements Serializable<AbstractBan> {
     private final String uuid;
     private final String ip;
@@ -38,6 +37,38 @@ public AbstractBan(String uuid, String ip, String source, String reason, long pr
         );
     }
 
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public long getPropagated() {
+        return propagated;
+    }
+
+    public long getExpiry() {
+        return expiry;
+    }
+
+    public List<Pair<String, String>> getContentPairs() {
+        return contentPairs;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
     public void setActive(boolean active) {
         this.active = active;
     }
@@ -48,8 +79,7 @@ public String serialize() {
     }
 
     @Override
-    public AbstractBan deserialize(String formatted) {
-        char delimiter = ':';
+    public AbstractBan deserialize(@NotNull String formatted) {
         char end = ';';
         char uuid = 'u';
         char ip = 'i';

build/tmp/shadowJar/MANIFEST.MF

@@ -1,46 +1,44 @@
 package mc.unraveled.reforged.banning;
 
-import lombok.Getter;
-import lombok.SneakyThrows;
 import mc.unraveled.reforged.api.Baker;
-import mc.unraveled.reforged.api.Locker;
 import mc.unraveled.reforged.plugin.Traverse;
 import mc.unraveled.reforged.storage.DBBan;
-import mc.unraveled.reforged.storage.DBUser;
 import org.bukkit.OfflinePlayer;
 
+import java.sql.Date;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public final class BanManager implements Locker, Baker {
-    @Getter
+public final class BanManager implements Baker {
     private final Traverse plugin;
 
     private Set<AbstractBan> storedBans; // This should only be reassigned by the baker.
-    @Getter
     private boolean baked = false; // This should only be reassigned by the baker.
 
-    @SneakyThrows
     public BanManager(Traverse plugin) {
         this.storedBans = new HashSet<>();
         this.plugin = plugin;
 
-        synchronized (lock()) {
-            DBBan banHandler = new DBBan(plugin.getSQLManager().establish());
-            storedBans.addAll(banHandler.all());
-            banHandler.close();
-
-            lock().wait(1000);
-        }
+        DBBan banHandler = new DBBan(plugin.getSQLManager().establish());
+        storedBans.addAll(banHandler.all());
+        banHandler.close();
 
         bake();
     }
 
+    public Traverse getPlugin() {
+        return plugin;
+    }
+
+    public boolean isBaked() {
+        return baked;
+    }
+
     public void insert(AbstractBan ban) {
         if (baked) throw new IllegalStateException("Cannot insert into a baked list.");
 
-        lock().notify();
         storedBans.add(ban);
         DBBan db = new DBBan(plugin.getSQLManager().establish());
         db.insert(ban);
@@ -50,8 +48,7 @@ public void insert(AbstractBan ban) {
     public void eject(AbstractBan ban) {
         if (baked) throw new IllegalStateException("Cannot eject from a baked list.");
 
-        lock().notify();
-
+        storedBans.remove(ban);
         DBBan db = new DBBan(plugin.getSQLManager().establish());
         db.delete(ban);
         db.close();
@@ -66,13 +63,22 @@ public AbstractBan getBan(OfflinePlayer player) {
 
     public boolean isBanned(OfflinePlayer player) {
         return storedBans.stream()
+                .filter(AbstractBan::isActive)
+                .filter(ban -> {
+                    Date date = new Date(ban.getExpiry());
+                    if (date.before(Date.from(Instant.now()))) {
+                        eject(ban);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                })
                 .anyMatch(ban -> ban.getUuid().equalsIgnoreCase(
                         player.getUniqueId().toString()));
     }
 
     public void save() {
         if (!baked) throw new IllegalStateException("Cannot save an unbaked list.");
-        lock().notify();
 
         DBBan banHandler = new DBBan(plugin.getSQLManager().establish());
         storedBans.forEach(banHandler::insert);
@@ -83,7 +89,6 @@ public void save() {
     public void bake() {
         if (baked) return;
 
-        lock().notify();
         storedBans = storedBans.stream().collect(Collectors.toUnmodifiableSet());
 
         baked = true;
@@ -93,7 +98,6 @@ public void bake() {
     public void unbake() {
         if (!baked) return;
 
-        lock().notify();
         storedBans = new HashSet<>(storedBans);
 
         baked = false;

src/main/java/mc/unraveled/reforged/api/Locker.java

@@ -0,0 +1,67 @@
+package mc.unraveled.reforged.command;
+
+import mc.unraveled.reforged.api.annotations.CommandInfo;
+import mc.unraveled.reforged.banning.AbstractBan;
+import mc.unraveled.reforged.command.base.AbstractCommandBase;
+import mc.unraveled.reforged.plugin.Traverse;
+import mc.unraveled.reforged.util.ComponentBuilder;
+import mc.unraveled.reforged.util.Utilities;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@CommandInfo(
+        name = "baninfo",
+        description = "Shows information about a ban",
+        usage = "/baninfo <player>",
+        aliases = {"bi", "bandata"}
+)
+public class BanInfoCMD extends AbstractCommandBase {
+    public BanInfoCMD(@NotNull Traverse plugin) {
+        super(plugin, "baninfo");
+    }
+
+    @Override
+    public Component cmd(CommandSender sender, String[] args) {
+        if (args.length != 1) {
+            return Component.text("Usage: /baninfo <player>");
+        }
+
+        OfflinePlayer player = getPlugin().getServer().getOfflinePlayer(args[0]);
+        AbstractBan ban = getPlugin().getBanManager().getBan(player);
+
+        if (ban == null) {
+            return Component.text("That player is not banned.");
+        }
+
+        NamedTextColor GENERAL = NamedTextColor.YELLOW;
+        NamedTextColor INFO = NamedTextColor.GREEN;
+        NamedTextColor DETAIL = NamedTextColor.RED;
+
+        return ComponentBuilder.begin()
+                .append("Ban info for ", GENERAL)
+                .append(player.getName(), DETAIL)
+                .append(":", GENERAL)
+                .append("\nUUID: ", INFO)
+                .append(ban.getUuid(), DETAIL)
+                .append("\nIP: ", INFO)
+                .append(ban.getIp(), DETAIL)
+                .append("\nReason: ", INFO)
+                .append(ban.getReason(), DETAIL)
+                .append("\nBanned by: ", INFO)
+                .append(ban.getSource(), DETAIL)
+                .append("\nBanned on: ", INFO)
+                .append(ban.getPropagated(), DETAIL)
+                .append("\nExpires on: ", INFO)
+                .append(ban.getExpiry(), DETAIL).build();
+    }
+
+    @Override
+    public List<String> tab(CommandSender sender, String[] args) {
+        return Utilities.playerCompletions(args[0]);
+    }
+}