From 91c24d55018f556c623cbf4e8d92f32aacd7c4d3 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 12 Sep 2021 07:48:01 -0400 Subject: [PATCH] Fixes lombok --- .../volmit/iris/engine/object/IrisInterpolator.java | 12 ++++++++++++ .../iris/engine/object/IrisMatterPlacement.java | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java index 47c124201..6c89b2c2b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java @@ -51,11 +51,23 @@ public class IrisInterpolator { @Desc("The range checked horizontally. Smaller ranges yeild more detail but are not as smooth.") private double horizontalScale = 7; + @Override public int hashCode() { return Objects.hash(horizontalScale, function); } + @Override + public boolean equals(Object o) + { + if(o instanceof IrisInterpolator i) + { + return i.getFunction().equals(function) && i.getHorizontalScale() == horizontalScale; + } + + return false; + } + public double interpolate(double x, double z, NoiseProvider provider) { return interpolate((int) Math.round(x), (int) Math.round(z), provider); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMatterPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisMatterPlacement.java index 4bf4fcf66..754b698f2 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMatterPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMatterPlacement.java @@ -20,7 +20,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Snippet; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -30,7 +29,6 @@ import lombok.experimental.Accessors; @EqualsAndHashCode() @Accessors(chain = true) @NoArgsConstructor -@AllArgsConstructor @Desc("Represents an iris object placer. It places objects.") @Data public class IrisMatterPlacement {