From 433688e813d41c198e1157d51a86a5e51c1a93c9 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Thu, 17 Feb 2022 02:02:48 +0100
Subject: [PATCH] Added random offset for particles

---
 src/main/java/com/alttd/objects/AParticle.java | 2 +-
 src/main/java/com/alttd/objects/Frame.java     | 6 +++++-
 src/main/java/com/alttd/particles/Alpha.java   | 2 +-
 src/main/java/com/alttd/particles/Test.java    | 8 ++++----
 src/main/resources/plugin.yml                  | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/alttd/objects/AParticle.java b/src/main/java/com/alttd/objects/AParticle.java
index 77eb424..0b4b3ae 100644
--- a/src/main/java/com/alttd/objects/AParticle.java
+++ b/src/main/java/com/alttd/objects/AParticle.java
@@ -2,4 +2,4 @@ package com.alttd.objects;
 
 import com.destroystokyo.paper.ParticleBuilder;
 
-public record AParticle(double x, double y, double z, ParticleBuilder particleBuilder) {}
+public record AParticle(double x, double y, double z, double offset_range, ParticleBuilder particleBuilder) {}
diff --git a/src/main/java/com/alttd/objects/Frame.java b/src/main/java/com/alttd/objects/Frame.java
index fe9fdcb..f857e17 100644
--- a/src/main/java/com/alttd/objects/Frame.java
+++ b/src/main/java/com/alttd/objects/Frame.java
@@ -5,6 +5,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
 public class Frame {
@@ -22,8 +23,11 @@ public class Frame {
     public void spawn(Location location) {
         Location tmpLocation = location.clone();
         AParticles.forEach(AParticle -> {
+            ThreadLocalRandom current = ThreadLocalRandom.current();
             AParticle.particleBuilder()
-                    .location(tmpLocation.set(location.getX() + AParticle.x(), location.getY() + AParticle.y(), location.getZ() + AParticle.z()))
+                    .location(tmpLocation.set(location.getX() + AParticle.x() + current.nextDouble(-AParticle.offset_range(), AParticle.offset_range()),
+                            location.getY() + AParticle.y() + current.nextDouble(-AParticle.offset_range(), AParticle.offset_range()),
+                            location.getZ() + AParticle.z() + current.nextDouble(-AParticle.offset_range(), AParticle.offset_range())))
                     .receivers(Bukkit.getOnlinePlayers().stream()
                             .filter(player -> {
                                 PlayerSettings playerSettings = PlayerSettings.getPlayer(player.getUniqueId());
diff --git a/src/main/java/com/alttd/particles/Alpha.java b/src/main/java/com/alttd/particles/Alpha.java
index e02ef25..3973221 100644
--- a/src/main/java/com/alttd/particles/Alpha.java
+++ b/src/main/java/com/alttd/particles/Alpha.java
@@ -47,7 +47,7 @@ public class Alpha {
         double[] zPts = {0.91, 0.86, 0.81, 0.76, 0.70, 0.63, 0.58, 0.52, 0.47, 0.42, 0.39, 0.38, 0.39, 0.42, 0.47, 0.52, 0.58, 0.63, 0.69, 0.75, 0.81, 0.86, 0.89, 0.90, 0.89, 0.87, 0.83, 0.79, 0.74, 0.69, 0.57, 0.51, 0.46, 0.42, 0.40, 0.40, 0.42, 0.47};
 
         for(int i = 0; i < xPts.length; i++) {
-            list.add(new AParticle(xPts[i] * 5, 2, zPts[i] * 5, new ParticleBuilder(Particle.REDSTONE).color(Color.GRAY).count(1)));
+            list.add(new AParticle(xPts[i] * 5, 2, zPts[i] * 5, 0.5, new ParticleBuilder(Particle.REDSTONE).color(Color.GRAY).count(1)));
         }
         return list;
     }
diff --git a/src/main/java/com/alttd/particles/Test.java b/src/main/java/com/alttd/particles/Test.java
index 1a42482..0201ce2 100644
--- a/src/main/java/com/alttd/particles/Test.java
+++ b/src/main/java/com/alttd/particles/Test.java
@@ -47,10 +47,10 @@ public class Test {
 
     public List<AParticle> frameOne() {
         List<AParticle> list = new ArrayList<>();
-        list.add(new AParticle(0, 2, 0, new ParticleBuilder(Particle.TOTEM)));
-        list.add(new AParticle(0, 2, 0, new ParticleBuilder(Particle.TOTEM)));
-        list.add(new AParticle(0, 2, 0, new ParticleBuilder(Particle.TOTEM)));
-        list.add(new AParticle(0, 2, 0, new ParticleBuilder(Particle.TOTEM)));
+        list.add(new AParticle(0, 2, 0, 0.3, new ParticleBuilder(Particle.TOTEM)));
+        list.add(new AParticle(0, 2, 0, 0.3, new ParticleBuilder(Particle.TOTEM)));
+        list.add(new AParticle(0, 2, 0, 0.3, new ParticleBuilder(Particle.TOTEM)));
+        list.add(new AParticle(0, 2, 0, 0.3, new ParticleBuilder(Particle.TOTEM)));
         return list;
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 9a77c02..32ebc1a 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: AltitudeParticles
 version: ${project.version}
 main: com.alttd.AltitudeParticles
-api-version: 1.17
+api-version: 1.18
 commands:
   apart:
     permission: apart.use