Merge pull request #84 from TheNextLvl-net/delombok

Removed `@RequiredArgsConstructor` and adjusted constructor usage

Author: NonSwag

build.gradle.kts

@@ -29,7 +29,6 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.36")
     compileOnly("net.thenextlvl.services:service-io:2.2.0")
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
@@ -39,8 +38,6 @@ dependencies {
     implementation("net.thenextlvl.core:nbt:2.3.1")
     implementation("net.thenextlvl.core:paper:2.0.4")
     implementation("org.bstats:bstats-bukkit:3.1.0")
-
-    annotationProcessor("org.projectlombok:lombok:1.18.36")
 }
 
 tasks.shadowJar {

src/main/java/net/thenextlvl/tweaks/TweaksPlugin.java

@@ -6,17 +6,19 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.thenextlvl.tweaks.TweaksPlugin;
 import net.thenextlvl.tweaks.command.suggestion.WorldSuggestionProvider;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 
-@RequiredArgsConstructor
 public abstract class WorldCommand {
     protected final TweaksPlugin plugin;
 
+    protected WorldCommand(TweaksPlugin plugin) {
+        this.plugin = plugin;
+    }
+
     public LiteralCommandNode<CommandSourceStack> create(String command, String permission) {
         return Commands.literal(command)
                 .requires(stack -> stack.getSender().hasPermission(permission))

src/main/java/net/thenextlvl/tweaks/command/environment/WorldCommand.java

@@ -15,8 +15,8 @@ public DayCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().day().command(), "tweaks.command.time.day");
-        registrar.register(command, "Set the time to day", plugin.commands().day().aliases());
+        var command = create(plugin.commands().day.command, "tweaks.command.time.day");
+        registrar.register(command, "Set the time to day", plugin.commands().day.aliases);
     }
 
     @Override

src/main/java/net/thenextlvl/tweaks/command/environment/time/DayCommand.java

@@ -15,8 +15,8 @@ public MidnightCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().midnight().command(), "tweaks.command.time.midnight");
-        registrar.register(command, "Set the time to midnight", plugin.commands().midnight().aliases());
+        var command = create(plugin.commands().midnight.command, "tweaks.command.time.midnight");
+        registrar.register(command, "Set the time to midnight", plugin.commands().midnight.aliases);
     }
 
     @Override

src/main/java/net/thenextlvl/tweaks/command/environment/time/MidnightCommand.java

@@ -15,8 +15,8 @@ public NightCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().night().command(), "tweaks.command.time.night");
-        registrar.register(command, "Set the time to night", plugin.commands().night().aliases());
+        var command = create(plugin.commands().night.command, "tweaks.command.time.night");
+        registrar.register(command, "Set the time to night", plugin.commands().night.aliases);
     }
 
     @Override

src/main/java/net/thenextlvl/tweaks/command/environment/time/NightCommand.java

@@ -15,8 +15,8 @@ public NoonCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().noon().command(), "tweaks.command.time.noon");
-        registrar.register(command, "Set the time to noon", plugin.commands().noon().aliases());
+        var command = create(plugin.commands().noon.command, "tweaks.command.time.noon");
+        registrar.register(command, "Set the time to noon", plugin.commands().noon.aliases);
     }
 
     @Override

src/main/java/net/thenextlvl/tweaks/command/environment/time/NoonCommand.java

@@ -7,7 +7,6 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.thenextlvl.tweaks.TweaksPlugin;
 import org.bukkit.World;
@@ -16,12 +15,15 @@
 import java.util.function.Function;
 
 @NullMarked
-@RequiredArgsConstructor
 public class TimeCommand {
     private final TweaksPlugin plugin;
 
+    public TimeCommand(TweaksPlugin plugin) {
+        this.plugin = plugin;
+    }
+
     public void register(Commands registrar) {
-        var command = Commands.literal(plugin.commands().time().command())
+        var command = Commands.literal(plugin.commands().time.command)
                 .requires(stack -> stack.getSender().hasPermission("tweaks.command.time"))
                 .then(Commands.literal("set")
                         .then(setTime("afternoon", "tweaks.command.time.afternoon", 9000))
@@ -45,7 +47,7 @@ public void register(Commands registrar) {
                         .then(query("daytime", world -> world.getFullTime() % 24000L))
                         .then(query("gametime", world -> world.getGameTime() % 2147483647L)))
                 .build();
-        registrar.register(command, "Manage the time on your server", plugin.commands().time().aliases());
+        registrar.register(command, "Manage the time on your server", plugin.commands().time.aliases);
     }
 
     private LiteralArgumentBuilder<CommandSourceStack> query(String literal, Function<World, Long> function) {

src/main/java/net/thenextlvl/tweaks/command/environment/time/TimeCommand.java

@@ -13,8 +13,8 @@ public RainCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().rain().command(), "tweaks.command.weather.rain");
-        registrar.register(command, "Let it rain", plugin.commands().rain().aliases());
+        var command = create(plugin.commands().rain.command, "tweaks.command.weather.rain");
+        registrar.register(command, "Let it rain", plugin.commands().rain.aliases);
     }
 
     @Override

src/main/java/net/thenextlvl/tweaks/command/environment/weather/RainCommand.java

@@ -13,8 +13,8 @@ public SunCommand(TweaksPlugin plugin) {
     }
 
     public void register(Commands registrar) {
-        var command = create(plugin.commands().sun().command(), "tweaks.command.weather.sun");
-        registrar.register(command, "Let the sun shine", plugin.commands().sun().aliases());
+        var command = create(plugin.commands().sun.command, "tweaks.command.weather.sun");
+        registrar.register(command, "Let the sun shine", plugin.commands().sun.aliases);
     }
 
     @Override