Release/v26.9 sirius

README.md

@@ -1,6 +1,6 @@
 # TotalFreedomMod r03
 ![Release](https://img.shields.io/github/v/release/tfreedomorg/TotalFreedomMod?include_prereleases&style=plastic)
-![Version](https://img.shields.io/badge/version-26.7-green?style=plastic)
+![Version](https://img.shields.io/badge/version-26.7.1-green?style=plastic)
 ![License](https://img.shields.io/badge/license-TFGL%20v2.0-orange?style=plastic)
 ![Code size](https://img.shields.io/github/languages/code-size/tfreedomorg/TotalFreedomMod?style=plastic)
 

build.gradle

@@ -1,17 +1,26 @@
 plugins {
     id 'java'
     id 'com.gorylenko.gradle-git-properties' version '2.5.7'
+    id 'org.openrewrite.rewrite' version '7.38.0'
 }
 
 group = 'me.totalfreedom'
-version = '26.7.1'
+version = '26.9'
 
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
+rewrite {
+    activeRecipe(
+        "org.openrewrite.java.RemoveUnusedImports",
+        "org.openrewrite.java.OrderImports"
+    )
+    activeStyle("me.totalfreedom.totalfreedommod.WildcardStyle")
+}
+
 repositories {
     mavenCentral()
     maven {
@@ -39,28 +48,43 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'io.papermc.paper:paper-api:26.1.2.build.61-stable'
+    // deprecated
     compileOnly 'org.projectlombok:lombok:1.18.42'
     annotationProcessor 'org.projectlombok:lombok:1.18.42'
-    compileOnly 'org.apache.commons:commons-lang3:3.14.0'
     compileOnly 'commons-io:commons-io:2.16.1'
-    compileOnly 'net.kyori:adventure-text-serializer-ansi:4.17.0'
     compileOnly 'net.milkbowl.vault:VaultUnlockedAPI:2.16'
+
+    // paper
+    compileOnly 'io.papermc.paper:paper-api:26.1.2.build.61-stable'
+    compileOnly 'net.kyori:adventure-text-serializer-ansi:4.17.0'
+
+    // plugins
     compileOnly('com.sk89q.worldedit:worldedit-bukkit:7.3.10') { transitive = false }
     compileOnly('com.sk89q.worldedit:worldedit-core:7.3.10') { transitive = false }
+    compileOnly "net.coreprotect:coreprotect:22.4"
 
-    compileOnly 'org.apache.sshd:sshd-core:2.17.1'
+    // packets
+    compileOnly 'com.github.retrooper:packetevents-spigot:2.12.1'
 
-    compileOnly 'org.jline:jline:3.28.0'
-    compileOnly 'org.apache.logging.log4j:log4j-core:2.24.3'
+    // discord stuff
+    compileOnly 'com.discord4j:discord4j-core:3.3.2'
 
-    compileOnly 'net.dv8tion:JDA:5.6.1'
+    // ssh
+    compileOnly 'org.apache.sshd:sshd-core:2.17.1'
 
-    compileOnly 'com.github.retrooper:packetevents-spigot:2.12.1'
+    // sql
+    compileOnly 'io.projectreactor:reactor-core:3.8.3'
+    compileOnly 'org.postgresql:postgresql:42.7.7'
+    compileOnly 'org.xerial:sqlite-jdbc:3.49.1.0'
+    compileOnly 'com.mysql:mysql-connector-j:9.3.0'
+    compileOnly 'com.zaxxer:HikariCP:6.3.0'
 
-    compileOnly "net.coreprotect:coreprotect:22.4"
+    // logging
+    compileOnly 'org.jline:jline:3.28.0'
+    compileOnly 'org.apache.logging.log4j:log4j-core:2.24.3'
 }
 
+// ... is this really necessary???
 configurations.all {
     resolutionStrategy {
         force 'io.papermc.paper:paper-api:26.1.2.build.61-stable'
@@ -136,8 +160,8 @@ processResources {
         }
 
         expand(
-            buildAuthor: project.findProperty('buildAuthor') ?: 'Ivanomoly',
-            buildCodeName: project.findProperty('buildCodeName') ?: 'Polaris',
+            buildAuthor: project.findProperty('buildAuthor') ?: 'TotalFreedom', // Collective Effort :)
+            buildCodeName: project.findProperty('buildCodeName') ?: 'Sirius',
             buildNumber: buildNumber,
             buildVersion: project.version
         )

rewrite.yml

@@ -0,0 +1,42 @@
+---
+type: specs.openrewrite.org/v1beta/style
+name: me.totalfreedom.totalfreedommod.WildcardStyle
+styleConfigs:
+  - org.openrewrite.java.style.ImportLayoutStyle:
+      # anything lower than 5 will cause conflicts, 5 or higher is a good standard.
+      classCountToUseStarImport: 5
+      nameCountToUseStarImport: 5
+      layout:
+        # JDK
+        - import java.*
+        - import javax.*
+        - <blank line>
+        # server platform
+        - import com.destroystokyo.*
+        - import com.mojang.*
+        - import io.papermc.*
+        - import org.bukkit.*
+        - <blank line>
+        # adventure
+        - import net.kyori.*
+        - <blank line>
+        # third-party plugins
+        - import com.sk89q.*
+        - import net.coreprotect.*
+        - import net.milkbowl.*
+        - <blank line>
+        # github imports
+        - import com.github.*
+        - <blank line>
+        # reactive
+        - import discord4j.*
+        - import io.netty.*
+        - import reactor.*
+        - <blank line>
+        # project
+        - import me.totalfreedom.*
+        - <blank line>
+        # everything else
+        - import all other imports
+        - <blank line>
+        - import static all other imports

src/main/java/me/totalfreedom/totalfreedommod/Announcer.java

@@ -1,14 +1,17 @@
 package me.totalfreedom.totalfreedommod;
 
-import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
-import lombok.Getter;
+
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FTask;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
+
+import com.google.common.collect.Lists;
+import lombok.Getter;
 
 public class Announcer extends FreedomService
 {

src/main/java/me/totalfreedom/totalfreedommod/AntiDrop.java

@@ -2,10 +2,7 @@
 
 import java.util.Iterator;
 import java.util.List;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.kyori.adventure.text.format.NamedTextColor;
+
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,6 +11,12 @@
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.inventory.ItemStack;
 
+import net.kyori.adventure.text.format.NamedTextColor;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+
 public class AntiDrop extends FreedomService
 {
 

src/main/java/me/totalfreedom/totalfreedommod/AntiNuke.java

@@ -1,16 +1,18 @@
 package me.totalfreedom.totalfreedommod;
 
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+import net.kyori.adventure.text.format.NamedTextColor;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+
 public class AntiNuke extends FreedomService
 {
 

src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java

@@ -1,22 +1,25 @@
 package me.totalfreedom.totalfreedommod;
 
-import io.papermc.paper.event.player.AsyncChatEvent;
 import java.util.Locale;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import io.papermc.paper.event.player.AsyncChatEvent;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.ChatSpamData;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.AdventureUtil;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
 public class AntiSpam extends FreedomService
 {

src/main/java/me/totalfreedom/totalfreedommod/AutoEject.java

@@ -3,14 +3,17 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+
+import net.kyori.adventure.text.format.NamedTextColor;
+
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
 
 public class AutoEject extends FreedomService
 {

src/main/java/me/totalfreedom/totalfreedommod/AutoKick.java

@@ -1,12 +1,13 @@
 package me.totalfreedom.totalfreedommod;
 
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FTask;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FTask;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+
 public class AutoKick extends FreedomService
 {