From dc2f68cf9e872169edc97ab8a7bda6e7c75623c8 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 15 Jun 2024 23:59:12 +0200 Subject: [PATCH] added lombok --- build.gradle.kts | 2 + .../thenextlvl/gopaint/brush/PlayerBrush.java | 89 ++---------------- .../gopaint/command/ReloadCommand.java | 7 +- .../gopaint/listeners/ConnectListener.java | 8 +- .../gopaint/listeners/InteractListener.java | 8 +- .../gopaint/listeners/InventoryListener.java | 10 +- .../gopaint/objects/brush/Brush.java | 37 +------- .../gopaint/objects/other/SurfaceMode.java | 12 +-- .../utils/curve/BezierSplineSegment.java | 92 +++---------------- 9 files changed, 39 insertions(+), 226 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d0319d31..37a10860 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ repositories { } dependencies { + compileOnly("org.projectlombok:lombok:1.18.32") // Paper / Spigot compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT") // Fawe / WorldEdit @@ -36,6 +37,7 @@ dependencies { implementation("org.incendo:cloud-paper:2.0.0-beta.8") implementation("org.incendo:cloud-annotations:2.0.0-rc.2") annotationProcessor("org.incendo:cloud-annotations:2.0.0-rc.2") + annotationProcessor("org.projectlombok:lombok:1.18.32") } paper { diff --git a/src/main/java/net/thenextlvl/gopaint/brush/PlayerBrush.java b/src/main/java/net/thenextlvl/gopaint/brush/PlayerBrush.java index 7428940c..74fac7d8 100644 --- a/src/main/java/net/thenextlvl/gopaint/brush/PlayerBrush.java +++ b/src/main/java/net/thenextlvl/gopaint/brush/PlayerBrush.java @@ -18,6 +18,9 @@ */ package net.thenextlvl.gopaint.brush; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; @@ -52,6 +55,9 @@ /** * The PlayerBrush class represents the brush settings of a player. */ +@Getter +@Setter +@Accessors(fluent = true) public final class PlayerBrush implements BrushSettings { private final @NotNull PlayerBrushManager brushManager; @@ -101,89 +107,6 @@ public PlayerBrush(@NotNull PlayerBrushManager brushManager) { return blocks().get(random.nextInt(blocks().size())); } - @Override - public @NotNull Brush brush() { - return brush; - } - - public void setBrush(@NotNull Brush brush) { - this.brush = brush; - } - - @Override - public @NotNull Random random() { - return random; - } - - @Override - public int falloffStrength() { - return falloffStrength; - } - - @Override - public int mixingStrength() { - return mixingStrength; - } - - @Override - public double angleHeightDifference() { - return this.angleHeightDifference; - } - - @Override - public int angleDistance() { - return this.angleDistance; - } - - @Override - public int fractureDistance() { - return this.fractureDistance; - } - - @Override - public @NotNull Material mask() { - return mask; - } - - @Override - public @NotNull List blocks() { - return blocks; - } - - @Override - public int size() { - return size; - } - - public boolean enabled() { - return enabled; - } - - @Override - public boolean maskEnabled() { - return maskEnabled; - } - - @Override - public int chance() { - return chance; - } - - @Override - public SurfaceMode surfaceMode() { - return surfaceMode; - } - - @Override - public int thickness() { - return thickness; - } - - @Override - public @NotNull Axis axis() { - return axis; - } - public void updateInventory() { GUI.update(gui, this); } diff --git a/src/main/java/net/thenextlvl/gopaint/command/ReloadCommand.java b/src/main/java/net/thenextlvl/gopaint/command/ReloadCommand.java index 60b6f315..d36bcb7f 100644 --- a/src/main/java/net/thenextlvl/gopaint/command/ReloadCommand.java +++ b/src/main/java/net/thenextlvl/gopaint/command/ReloadCommand.java @@ -18,19 +18,16 @@ */ package net.thenextlvl.gopaint.command; +import lombok.RequiredArgsConstructor; import net.thenextlvl.gopaint.GoPaintPlugin; import org.bukkit.entity.Player; import org.incendo.cloud.annotations.Command; import org.incendo.cloud.annotations.Permission; +@RequiredArgsConstructor public final class ReloadCommand { - private final GoPaintPlugin plugin; - public ReloadCommand(final GoPaintPlugin plugin) { - this.plugin = plugin; - } - @Command("bgp|gp reload") @Permission(GoPaintPlugin.RELOAD_PERMISSION) public void onReload(Player player) { diff --git a/src/main/java/net/thenextlvl/gopaint/listeners/ConnectListener.java b/src/main/java/net/thenextlvl/gopaint/listeners/ConnectListener.java index 2d415919..5254bf6a 100644 --- a/src/main/java/net/thenextlvl/gopaint/listeners/ConnectListener.java +++ b/src/main/java/net/thenextlvl/gopaint/listeners/ConnectListener.java @@ -18,23 +18,19 @@ */ package net.thenextlvl.gopaint.listeners; +import lombok.RequiredArgsConstructor; import net.thenextlvl.gopaint.brush.PlayerBrushManager; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; +@RequiredArgsConstructor public class ConnectListener implements Listener { - private final PlayerBrushManager brushManager; - public ConnectListener(PlayerBrushManager brushManager) { - this.brushManager = brushManager; - } - @EventHandler(priority = EventPriority.LOWEST) public void onQuit(PlayerQuitEvent event) { brushManager.removeBrush(event.getPlayer()); } - } diff --git a/src/main/java/net/thenextlvl/gopaint/listeners/InteractListener.java b/src/main/java/net/thenextlvl/gopaint/listeners/InteractListener.java index 9f94784f..2c04a8e6 100644 --- a/src/main/java/net/thenextlvl/gopaint/listeners/InteractListener.java +++ b/src/main/java/net/thenextlvl/gopaint/listeners/InteractListener.java @@ -19,6 +19,7 @@ package net.thenextlvl.gopaint.listeners; import com.sk89q.worldedit.bukkit.BukkitAdapter; +import lombok.RequiredArgsConstructor; import net.kyori.adventure.text.TextComponent; import net.thenextlvl.gopaint.GoPaintPlugin; import net.thenextlvl.gopaint.brush.BrushSettings; @@ -40,14 +41,10 @@ import java.util.Optional; +@RequiredArgsConstructor public final class InteractListener implements Listener { - private final GoPaintPlugin plugin; - public InteractListener(GoPaintPlugin plugin) { - this.plugin = plugin; - } - @EventHandler(priority = EventPriority.LOWEST) public void onClick(PlayerInteractEvent event) { Player player = event.getPlayer(); @@ -120,5 +117,4 @@ public void onClick(PlayerInteractEvent event) { plugin.bundle().sendMessage(player, "brush.disabled"); } } - } diff --git a/src/main/java/net/thenextlvl/gopaint/listeners/InventoryListener.java b/src/main/java/net/thenextlvl/gopaint/listeners/InventoryListener.java index 9f58d10e..e47d1109 100644 --- a/src/main/java/net/thenextlvl/gopaint/listeners/InventoryListener.java +++ b/src/main/java/net/thenextlvl/gopaint/listeners/InventoryListener.java @@ -18,6 +18,7 @@ */ package net.thenextlvl.gopaint.listeners; +import lombok.RequiredArgsConstructor; import net.kyori.adventure.text.TextComponent; import net.thenextlvl.gopaint.brush.PlayerBrush; import net.thenextlvl.gopaint.brush.PlayerBrushManager; @@ -43,14 +44,10 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.meta.ItemMeta; +@RequiredArgsConstructor public final class InventoryListener implements Listener { - private final PlayerBrushManager brushManager; - public InventoryListener(PlayerBrushManager brushManager) { - this.brushManager = brushManager; - } - @EventHandler(priority = EventPriority.LOWEST) public void menuClick(InventoryClickEvent event) { if (!(event.getWhoClicked() instanceof Player player)) { @@ -221,10 +218,9 @@ public void menuBrushClick(InventoryClickEvent event) { //noinspection deprecation String name = itemMeta.getDisplayName().replace("ยง6", ""); brushManager.getBrushHandler(name).ifPresent(brush -> { - playerBrush.setBrush(brush); + playerBrush.brush(brush); playerBrush.updateInventory(); player.openInventory(playerBrush.getInventory()); }); } - } diff --git a/src/main/java/net/thenextlvl/gopaint/objects/brush/Brush.java b/src/main/java/net/thenextlvl/gopaint/objects/brush/Brush.java index a03b019f..a44e3c99 100644 --- a/src/main/java/net/thenextlvl/gopaint/objects/brush/Brush.java +++ b/src/main/java/net/thenextlvl/gopaint/objects/brush/Brush.java @@ -25,6 +25,8 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitPlayer; import com.sk89q.worldedit.math.BlockVector3; +import lombok.Getter; +import lombok.RequiredArgsConstructor; import net.thenextlvl.gopaint.brush.BrushSettings; import net.thenextlvl.gopaint.utils.Surface; import org.bukkit.Location; @@ -35,43 +37,12 @@ import java.util.function.Consumer; +@Getter +@RequiredArgsConstructor public abstract class Brush { private final @NotNull String name, description, head; - protected Brush(@NotNull String name, @NotNull String description, @NotNull String head) { - this.description = description; - this.name = name; - this.head = head; - } - - /** - * Retrieves the description of the brush. - * - * @return The description of the brush. - */ - public @NotNull String getDescription() { - return description; - } - - /** - * Retrieves the head of the brush. - * - * @return The head of the brush. - */ - public @NotNull String getHead() { - return head; - } - - /** - * Retrieves the name of the brush. - * - * @return The name of the brush. - */ - public @NotNull String getName() { - return name; - } - /** * Performs a painting action using the provided location, player, and brush settings. * diff --git a/src/main/java/net/thenextlvl/gopaint/objects/other/SurfaceMode.java b/src/main/java/net/thenextlvl/gopaint/objects/other/SurfaceMode.java index f0bee067..8c552fce 100644 --- a/src/main/java/net/thenextlvl/gopaint/objects/other/SurfaceMode.java +++ b/src/main/java/net/thenextlvl/gopaint/objects/other/SurfaceMode.java @@ -18,6 +18,8 @@ */ package net.thenextlvl.gopaint.objects.other; +import lombok.Getter; +import lombok.RequiredArgsConstructor; import net.thenextlvl.gopaint.utils.Surface; import org.bukkit.Location; import org.bukkit.block.Block; @@ -26,6 +28,8 @@ import java.util.Arrays; import java.util.Optional; +@Getter +@RequiredArgsConstructor public enum SurfaceMode { /** * This enumeration represents a more intuitive check. @@ -48,14 +52,6 @@ public enum SurfaceMode { private final @NotNull String name; - SurfaceMode(@NotNull String name) { - this.name = name; - } - - public @NotNull String getName() { - return name; - } - public static @NotNull Optional byName(@NotNull String name) { return Arrays.stream(values()) .filter(surfaceMode -> surfaceMode.getName().equals(name)) diff --git a/src/main/java/net/thenextlvl/gopaint/utils/curve/BezierSplineSegment.java b/src/main/java/net/thenextlvl/gopaint/utils/curve/BezierSplineSegment.java index 4e54dac6..8c2b42b8 100644 --- a/src/main/java/net/thenextlvl/gopaint/utils/curve/BezierSplineSegment.java +++ b/src/main/java/net/thenextlvl/gopaint/utils/curve/BezierSplineSegment.java @@ -18,12 +18,16 @@ */ package net.thenextlvl.gopaint.utils.curve; +import lombok.Getter; +import lombok.Setter; import org.bukkit.Location; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Objects; +@Getter +@Setter public class BezierSplineSegment { private final double[] lengths = new double[20]; @@ -41,10 +45,6 @@ public BezierSplineSegment(@NotNull Location p0, @NotNull Location p3) { r = new Location(p0.getWorld(), 0, 0, 0); } - public double getCurveLength() { - return curveLength; - } - public void setX(double xflat2) { p0.setX(xflat2); p1.setX(xflat2); @@ -86,20 +86,20 @@ public double getdXdT(double t) { assert (t >= 0); assert (t <= 1); return 3 * (1 - t) * (1 - t) * (p1.getX() - p0.getX()) + 6 * (1 - t) * t - * (p2.getX() - p1.getX()) + 3 * t * t * (p3.getX() - p2.getX()); + * (p2.getX() - p1.getX()) + 3 * t * t * (p3.getX() - p2.getX()); } public double getdYdT(double t) { assert (t <= 1); return 3 * (1 - t) * (1 - t) * (p1.getY() - p0.getY()) + 6 * (1 - t) * t - * (p2.getY() - p1.getY()) + 3 * t * t * (p3.getY() - p2.getY()); + * (p2.getY() - p1.getY()) + 3 * t * t * (p3.getY() - p2.getY()); } public double getdZdT(double t) { assert (t >= 0); assert (t <= 1); return 3 * (1 - t) * (1 - t) * (p1.getZ() - p0.getZ()) + 6 * (1 - t) * t - * (p2.getZ() - p1.getZ()) + 3 * t * t * (p3.getZ() - p2.getZ()); + * (p2.getZ() - p1.getZ()) + 3 * t * t * (p3.getZ() - p2.getZ()); } public double getdTdS(double t) { @@ -137,7 +137,7 @@ public double getT(double d) { if (d == curveLength) { return 1; } - int i = 0; + int i; for (i = 0; i < 20; i++) { if (d == lengths[i]) { return i / 19d; @@ -152,14 +152,14 @@ public double getT(double d) { public Location getPoint(double f) { Location result = new Location(p0.getWorld(), 0, 0, 0); result.setX(Objects.requireNonNullElseGet(xFlat, () -> (Math.pow(1 - f, 3) * p0.getX()) - + (3 * Math.pow(1 - f, 2) * f * p1.getX()) - + (3 * (1 - f) * f * f * p2.getX()) + (Math.pow(f, 3) * p3.getX()))); + + (3 * Math.pow(1 - f, 2) * f * p1.getX()) + + (3 * (1 - f) * f * f * p2.getX()) + (Math.pow(f, 3) * p3.getX()))); result.setY(Objects.requireNonNullElseGet(yFlat, () -> (Math.pow(1 - f, 3) * p0.getY()) - + (3 * Math.pow(1 - f, 2) * f * p1.getY()) - + (3 * (1 - f) * f * f * p2.getY()) + (Math.pow(f, 3) * p3.getY()))); + + (3 * Math.pow(1 - f, 2) * f * p1.getY()) + + (3 * (1 - f) * f * f * p2.getY()) + (Math.pow(f, 3) * p3.getY()))); result.setZ(Objects.requireNonNullElseGet(zFlat, () -> (Math.pow(1 - f, 3) * p0.getZ()) - + (3 * Math.pow(1 - f, 2) * f * p1.getZ()) - + (3 * (1 - f) * f * f * p2.getZ()) + (Math.pow(f, 3) * p3.getZ()))); + + (3 * Math.pow(1 - f, 2) * f * p1.getZ()) + + (3 * (1 - f) * f * f * p2.getZ()) + (Math.pow(f, 3) * p3.getZ()))); return result; } @@ -167,68 +167,4 @@ public double getLinearLength() { return p0.distance(p3); } - public @NotNull Location getP0() { - return p0; - } - - public void setP0(@NotNull Location p0) { - this.p0 = p0; - } - - public @NotNull Location getP1() { - return p1; - } - - public void setP1(@NotNull Location p1) { - this.p1 = p1; - } - - public @NotNull Location getP2() { - return p2; - } - - public void setP2(@NotNull Location p2) { - this.p2 = p2; - } - - public @NotNull Location getP3() { - return p3; - } - - public void setP3(@NotNull Location p3) { - this.p3 = p3; - } - - public float getA() { - return a; - } - - public void setA(float a) { - this.a = a; - } - - public float getB() { - return b; - } - - public void setB(float b) { - this.b = b; - } - - public float getC() { - return c; - } - - public void setC(float c) { - this.c = c; - } - - public @NotNull Location getR() { - return r; - } - - public void setR(@NotNull Location r) { - this.r = r; - } - }