chore: reformat project

.editorconfig

@@ -6,7 +6,7 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 130
 tab_width = 4
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
@@ -137,7 +137,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_if_brace_force = always
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_imports_layout = *, |, $*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true

api/src/main/java/broccolai/tags/api/TagsApi.java

@@ -16,7 +16,7 @@ public static void register(final @NonNull Injector injector) {
         INJECTOR = injector;
     }
 
-    public static <T extends Service> T getService(final @NonNull Class<T> clazz) {
+    public static <T extends Service> T service(final @NonNull Class<T> clazz) {
         return INJECTOR.getInstance(clazz);
     }
 

api/src/main/java/broccolai/tags/api/model/tag/ConstructedTag.java

@@ -3,7 +3,6 @@
 import broccolai.tags.api.model.Permissible;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public record ConstructedTag(
         int id,

api/src/main/java/broccolai/tags/api/model/user/TagsUser.java

@@ -2,19 +2,18 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.impl.ConsoleTagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface TagsUser {
 
     TagsUser CONSOLE = new ConsoleTagsUser();
 
     @NonNull UUID uuid();
 
-    void setCurrent(@Nullable ConstructedTag tag);
+    void current(@Nullable ConstructedTag tag);
 
     @NonNull Optional<Integer> current();
 

api/src/main/java/broccolai/tags/api/model/user/impl/ConsoleTagsUser.java

@@ -2,11 +2,10 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class ConsoleTagsUser implements TagsUser {
 
@@ -20,7 +19,7 @@ public final class ConsoleTagsUser implements TagsUser {
     }
 
     @Override
-    public void setCurrent(final @Nullable ConstructedTag tag) {
+    public void current(final @Nullable ConstructedTag tag) {
         this.currentTag = tag != null ? tag.id() : null;
     }
 

api/src/main/java/broccolai/tags/api/model/user/impl/PlayerTagsUser.java

@@ -2,11 +2,10 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class PlayerTagsUser implements TagsUser {
 
@@ -27,7 +26,7 @@ public PlayerTagsUser(
     }
 
     @Override
-    public void setCurrent(final @Nullable ConstructedTag tag) {
+    public void current(final @Nullable ConstructedTag tag) {
         this.current = tag != null ? tag.id() : null;
     }
 

api/src/main/java/broccolai/tags/api/service/DataService.java

@@ -2,10 +2,9 @@
 
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public interface DataService extends Service {
 

api/src/main/java/broccolai/tags/api/service/MessageService.java

@@ -3,12 +3,11 @@
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
+import java.util.Collection;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Collection;
-
 public interface MessageService extends Service {
 
     TagResolver prefix();

api/src/main/java/broccolai/tags/api/service/TagsService.java

@@ -4,12 +4,11 @@
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.tag.TagDisplayInformation;
 import broccolai.tags.api.model.user.TagsUser;
+import java.util.Collection;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-
 public interface TagsService extends Service {
 
     @NotNull ConstructedTag defaultTag();

api/src/main/java/broccolai/tags/api/service/UserService.java

@@ -2,12 +2,11 @@
 
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public interface UserService extends Service {
 

build.gradle.kts

@@ -41,6 +41,8 @@ subprojects {
                 ci(true)
                 publishing(true)
             }
+
+            checkstyle("10.12.4")
         }
 
         processResources {

bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java

@@ -24,6 +24,7 @@
 import cloud.commandframework.paper.PaperCommandManager;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import java.util.Collection;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -33,8 +34,6 @@
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Collection;
-
 public final class BukkitTagsPlatform extends JavaPlugin implements TagsPlatform {
 
     private static final @NonNull Class<? extends Listener>[] BUKKIT_LISTENERS = ArrayUtilities.create(
@@ -62,7 +61,7 @@ public void onEnable() {
         this.plugin = injector.getInstance(TagsPlugin.class);
         this.plugin.start();
 
-        CommandManager<CommandUser> commandManager = this.getCommandManager(
+        CommandManager<CommandUser> commandManager = this.commandManager(
                 injector.getInstance(MessageService.class)
         );
 
@@ -77,7 +76,6 @@ public void onEnable() {
             );
         }
 
-
         this.plugin.commands(commandManager, BUKKIT_COMMANDS);
     }
 
@@ -86,7 +84,7 @@ public void onDisable() {
         this.plugin.shutdown();
     }
 
-    private CommandManager<CommandUser> getCommandManager(
+    private CommandManager<CommandUser> commandManager(
             final @NonNull MessageService messageService
     ) {
         try {
@@ -107,7 +105,7 @@ private CommandManager<CommandUser> getCommandManager(
 
             new MinecraftExceptionHandler<CommandUser>()
                     .withDefaultHandlers()
-                    .apply(commandManager, (e) -> e);
+                    .apply(commandManager, e -> e);
 
             commandManager.registerExceptionHandler(UserArgument.UserArgumentException.class, (user, ex) -> {
                 user.sendMessage(messageService.commandErrorUserNotFound(ex.input()));

bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java

@@ -1,11 +1,10 @@
 package broccolai.tags.bukkit.commands.context;
 
 import broccolai.tags.api.model.user.impl.ConsoleTagsUser;
+import java.util.UUID;
 import org.bukkit.command.CommandSender;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.UUID;
-
 public final class BukkitConsoleCommandUser extends BukkitCommandUser {
 
     public BukkitConsoleCommandUser(final @NonNull CommandSender source) {

bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java

@@ -1,10 +1,9 @@
 package broccolai.tags.bukkit.commands.context;
 
+import java.util.UUID;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.UUID;
-
 public final class BukkitPlayerCommandUser extends BukkitCommandUser {
 
     private final Player player;

bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java

@@ -9,12 +9,11 @@
 import broccolai.tags.bukkit.service.BukkitTaskService;
 import broccolai.tags.core.platform.TagsPlatform;
 import com.google.inject.AbstractModule;
+import java.io.File;
 import org.bukkit.plugin.Plugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 
-import java.io.File;
-
 public final class PlatformModule extends AbstractModule {
 
     private final @NonNull BukkitTagsPlatform plugin;

bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java

@@ -24,10 +24,10 @@ public BasicIntegration(final @NonNull UserService userService, final @NonNull T
 
     @EventHandler
     public void onChat(final @NonNull AsyncChatEvent event) {
-        event.renderer(((source, name, message, viewer) -> {
+        event.renderer((source, name, message, viewer) -> {
             ConstructedTag tag = this.tagsService.load(this.userService.get(source.getUniqueId()));
             return message.replaceText(builder -> builder.matchLiteral("%tag%").replacement(tag.component()));
-        }));
+        });
     }
 
 }

bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java

@@ -48,7 +48,7 @@ public String getVersion() {
     public String onRequest(final @NonNull OfflinePlayer player, final @NonNull String identifier) {
         TagsUser user = this.userService.get(player.getUniqueId());
 
-        if (identifier.equalsIgnoreCase("current")) {
+        if ("current".equalsIgnoreCase(identifier)) {
             ConstructedTag tag = this.tagsService.load(user);
             return LEGACY.serialize(tag.component());
         }

bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java

@@ -6,9 +6,7 @@
 import broccolai.tags.api.service.TaskService;
 import broccolai.tags.api.service.UserService;
 import com.google.inject.Inject;
-
 import java.util.UUID;
-
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;

bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java

@@ -8,8 +8,10 @@
 import broccolai.tags.core.config.LocaleConfiguration;
 import broccolai.tags.core.util.FormatingUtilites;
 import com.google.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -24,10 +26,6 @@
 import org.incendo.interfaces.paper.type.ChestInterface;
 import org.slf4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public final class TagsMenuFactory {
 
     private static final ItemStackElement<ChestPane> BOTTOM_BAR_ELEMENT = new ItemStackElement<>(
@@ -85,28 +83,26 @@ private PaginatedTransform<ItemStackElement<ChestPane>, ChestPane, PlayerViewer>
     private List<ItemStackElement<ChestPane>> createTagElements(final @NonNull TagsUser user) {
         return this.tagsService.allTags(user)
                 .stream()
-                .map((tag) -> createTagElement(user, tag))
+                .map(tag -> this.createTagElement(user, tag))
                 .toList();
     }
 
     private ItemStackElement<ChestPane> createTagElement(final @NonNull TagsUser user, final @NonNull ConstructedTag tag) {
-
-
-        Material material = matchMaterialOrDefault(tag.displayInformation().material());
+        Material material = this.matchMaterialOrDefault(tag.displayInformation().material());
         ItemStack item = PaperItemBuilder.ofType(material)
                 .name(tag.component())
                 .lore(this.createTagLore(tag))
                 .build();
 
-        return ItemStackElement.of(item, (ctx) -> {
+        return ItemStackElement.of(item, ctx -> {
             this.actionService.select(user, tag);
         });
     }
 
     private List<Component> createTagLore(final @NonNull ConstructedTag tag) {
         List<Component> result = new ArrayList<>();
 
-        result.addAll(formatTagReason(tag.reason()));
+        result.addAll(this.formatTagReason(tag.reason()));
 
         result.add(Component.empty());
         result.add(this.locale.equip.asComponent());
@@ -117,7 +113,7 @@ private List<Component> createTagLore(final @NonNull ConstructedTag tag) {
     private List<Component> formatTagReason(final @NonNull String reason) {
         return FormatingUtilites.splitString(reason, 30)
                 .stream()
-                .map((text) -> Component.text(text, NamedTextColor.WHITE))
+                .map(text -> Component.text(text, NamedTextColor.WHITE))
                 .collect(Collectors.toList());
     }
 

bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java

@@ -5,14 +5,13 @@
 import broccolai.tags.core.service.user.PipelineUserService;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import java.util.List;
+import java.util.Objects;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.List;
-import java.util.Objects;
-
 public final class BukkitPipelineUserService extends PipelineUserService {
 
     @Inject

core/src/main/java/broccolai/tags/core/TagsPlugin.java

@@ -15,9 +15,8 @@
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
 import com.zaxxer.hikari.HikariDataSource;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @Singleton
 public final class TagsPlugin {

core/src/main/java/broccolai/tags/core/commands/TagsAdminCommand.java

@@ -14,9 +14,8 @@
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.context.CommandContext;
 import com.google.inject.Inject;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class TagsAdminCommand implements PluginCommand {