Merge pull request #80 from TheNextLvl-net/de-lombok

Remove Lombok dependency and inline generated methods

Author: NonSwag

api/build.gradle.kts

@@ -25,7 +25,6 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.36")
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
     compileOnlyApi(platform("com.intellectualsites.bom:bom-newest:1.51"))
@@ -36,8 +35,6 @@ dependencies {
 
     api("net.thenextlvl.core:i18n:1.0.20")
     api("net.thenextlvl.core:paper:2.0.3")
-
-    annotationProcessor("org.projectlombok:lombok:1.18.36")
 }
 
 publishing {

api/src/main/java/net/thenextlvl/gopaint/api/brush/PatternBrush.java

@@ -6,11 +6,6 @@
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.Keyed;
@@ -19,14 +14,12 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 
+import java.util.Objects;
+
 /**
  * This interface represents a brush used for painting blocks in a world.
  */
-@Getter
-@ToString
 @NullMarked
-@EqualsAndHashCode
-@RequiredArgsConstructor
 public abstract class PatternBrush implements Comparable<PatternBrush>, Keyed, Brush {
     /**
      * Retrieves the base64 head value.
@@ -35,7 +28,12 @@ public abstract class PatternBrush implements Comparable<PatternBrush>, Keyed, B
     /**
      * The key that identifies this brush
      */
-    private final @Accessors(fluent = true) Key key;
+    private final Key key;
+
+    public PatternBrush(String headValue, Key key) {
+        this.headValue = headValue;
+        this.key = key;
+    }
 
     /**
      * Retrieves the localized name of this brush.
@@ -76,8 +74,36 @@ public abstract class PatternBrush implements Comparable<PatternBrush>, Keyed, B
     @Override
     public abstract void build(EditSession session, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException;
 
+    public String getHeadValue() {
+        return headValue;
+    }
+
+    @Override
+    public Key key() {
+        return key;
+    }
+
     @Override
     public int compareTo(@NonNull PatternBrush brush) {
         return key().compareTo(brush.key());
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        PatternBrush that = (PatternBrush) o;
+        return Objects.equals(key, that.key);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(key);
+    }
+
+    @Override
+    public String toString() {
+        return "PatternBrush{" +
+               "key=" + key +
+               '}';
+    }
 }

api/src/main/java/net/thenextlvl/gopaint/api/math/curve/BezierSpline.java

@@ -20,15 +20,13 @@
 
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.worldedit.math.BlockVector3;
-import lombok.Getter;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.NullMarked;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalDouble;
 
-@Getter
 @NullMarked
 public class BezierSpline {
 
@@ -148,6 +146,18 @@ public void calculateControlPoints() {
         zFlat.ifPresent(value -> Arrays.stream(segments).forEach(segment -> segment.setZ(value)));
     }
 
+    public BezierSplineSegment[] getSegments() {
+        return segments;
+    }
+
+    public MutableBlockVector3[] getKnots() {
+        return knots;
+    }
+
+    public double getCurveLength() {
+        return curveLength;
+    }
+
     @Override
     public String toString() {
         return knots.length + " points.";

api/src/main/java/net/thenextlvl/gopaint/api/math/curve/BezierSplineSegment.java

@@ -20,19 +20,13 @@
 
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.worldedit.math.BlockVector3;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 
-@Getter
-@Setter
 @NullMarked
-@RequiredArgsConstructor
 public class BezierSplineSegment {
 
     private final MutableBlockVector3 startPoint;
@@ -49,6 +43,11 @@ public class BezierSplineSegment {
 
     private MutableBlockVector3 result = MutableBlockVector3.at(0, 0, 0);
 
+    public BezierSplineSegment(MutableBlockVector3 startPoint, MutableBlockVector3 endPoint) {
+        this.startPoint = startPoint;
+        this.endPoint = endPoint;
+    }
+
     public void setX(double xFlat) {
         startPoint.mutX(xFlat);
         intermediatePoint1.mutX(xFlat);
@@ -104,4 +103,84 @@ private double calculatePoint(double factor, double startPoint, double intermedi
         return (Math.pow(1 - factor, 3) * startPoint) + (3 * Math.pow(1 - factor, 2) * factor * intermediatePoint1)
                + (3 * (1 - factor) * factor * factor * intermediatePoint2) + (Math.pow(factor, 3) * endPoint);
     }
+
+    public MutableBlockVector3 getStartPoint() {
+        return startPoint;
+    }
+
+    public MutableBlockVector3 getEndPoint() {
+        return endPoint;
+    }
+
+    public MutableBlockVector3 getResult() {
+        return result;
+    }
+
+    public MutableBlockVector3 getIntermediatePoint1() {
+        return intermediatePoint1;
+    }
+
+    public MutableBlockVector3 getIntermediatePoint2() {
+        return intermediatePoint2;
+    }
+
+    public float getCoefficient1() {
+        return coefficient1;
+    }
+
+    public float getCoefficient2() {
+        return coefficient2;
+    }
+
+    public float getCoefficient3() {
+        return coefficient3;
+    }
+
+    public @Nullable Double getXFlat() {
+        return xFlat;
+    }
+
+    public @Nullable Double getYFlat() {
+        return yFlat;
+    }
+
+    public @Nullable Double getZFlat() {
+        return zFlat;
+    }
+
+    public void setResult(MutableBlockVector3 result) {
+        this.result = result;
+    }
+
+    public void setIntermediatePoint1(MutableBlockVector3 intermediatePoint1) {
+        this.intermediatePoint1 = intermediatePoint1;
+    }
+
+    public void setIntermediatePoint2(MutableBlockVector3 intermediatePoint2) {
+        this.intermediatePoint2 = intermediatePoint2;
+    }
+
+    public void setCoefficient1(float coefficient1) {
+        this.coefficient1 = coefficient1;
+    }
+
+    public void setCoefficient2(float coefficient2) {
+        this.coefficient2 = coefficient2;
+    }
+
+    public void setCoefficient3(float coefficient3) {
+        this.coefficient3 = coefficient3;
+    }
+
+    public void setXFlat(@Nullable Double xFlat) {
+        this.xFlat = xFlat;
+    }
+
+    public void setYFlat(@Nullable Double yFlat) {
+        this.yFlat = yFlat;
+    }
+
+    public void setZFlat(@Nullable Double zFlat) {
+        this.zFlat = zFlat;
+    }
 }

api/src/main/java/net/thenextlvl/gopaint/api/model/SurfaceMode.java

@@ -1,17 +1,11 @@
 package net.thenextlvl.gopaint.api.model;
 
 import com.fastasyncworldedit.core.function.mask.SurfaceMask;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Accessors;
 import net.kyori.adventure.translation.Translatable;
 import net.thenextlvl.gopaint.api.brush.mask.VisibleMask;
 import org.jspecify.annotations.NullMarked;
 
-@Getter
 @NullMarked
-@RequiredArgsConstructor
-@Accessors(fluent = true)
 public enum SurfaceMode implements Translatable {
     /**
      * This enumeration represents that surface mode is disabled.
@@ -31,4 +25,13 @@ public enum SurfaceMode implements Translatable {
     VISIBLE("surface.mode.visible");
 
     private final String translationKey;
+
+    SurfaceMode(String translationKey) {
+        this.translationKey = translationKey;
+    }
+
+    @Override
+    public String translationKey() {
+        return translationKey;
+    }
 }

build.gradle.kts

@@ -22,14 +22,11 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.36")
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
     implementation("net.thenextlvl.core:adapters:2.0.1")
     implementation("org.bstats:bstats-bukkit:3.1.0")
     implementation(project(":api"))
-
-    annotationProcessor("org.projectlombok:lombok:1.18.36")
 }
 
 paper {

src/main/java/net/thenextlvl/gopaint/GoPaintPlugin.java

@@ -7,8 +7,6 @@
 import core.io.IO;
 import core.paper.adapters.inventory.MaterialAdapter;
 import core.paper.adapters.key.KeyAdapter;
-import lombok.Getter;
-import lombok.experimental.Accessors;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -29,7 +27,6 @@
 import org.bukkit.Axis;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -41,11 +38,9 @@
 import java.util.Set;
 
 @NullMarked
-@Accessors(fluent = true)
 public class GoPaintPlugin extends JavaPlugin implements GoPaintProvider {
-
     private final File translations = new File(getDataFolder(), "translations");
-    private final @Getter ComponentBundle bundle = new ComponentBundle(translations, audience ->
+    private final ComponentBundle bundle = new ComponentBundle(translations, audience ->
             audience instanceof Player player ? player.locale() : Locale.US)
             .register("messages", Locale.US)
             .register("messages_german", Locale.GERMANY)
@@ -54,11 +49,11 @@ public class GoPaintPlugin extends JavaPlugin implements GoPaintProvider {
                     Placeholder.component("prefix", bundle.component(Locale.US, "prefix"))
             )).build());
 
-    private final @Getter BrushController brushController = new CraftBrushController(this);
-    private final @Getter BrushRegistry brushRegistry = new CraftBrushRegistry(this);
+    private final BrushController brushController = new CraftBrushController(this);
+    private final BrushRegistry brushRegistry = new CraftBrushRegistry(this);
 
     private final FileIO<PluginConfig> configFile = new GsonFile<>(IO.of(getDataFolder(), "config.json"), new PluginConfig(
-            new PluginConfig.BrushConfig(Material.FEATHER, new NamespacedKey("gopaint", "sphere_brush"), 100, 10, 50,
+            new PluginConfig.BrushConfig(Material.FEATHER, Key.key("gopaint", "sphere_brush"), 100, 10, 50,
                     Axis.Y, 50, 50, Set.of("disabled"), true, Material.SPONGE, true, SurfaceMode.EXPOSED,
                     List.of(Material.STONE)),
             new PluginConfig.ThicknessConfig(1, 5),
@@ -117,4 +112,16 @@ private void registerCommands() {
     public PluginConfig config() {
         return configFile.getRoot();
     }
+
+    public ComponentBundle bundle() {
+        return this.bundle;
+    }
+
+    public BrushController brushController() {
+        return this.brushController;
+    }
+
+    public BrushRegistry brushRegistry() {
+        return this.brushRegistry;
+    }
 }