Allow setting custom update speeds

Author: iam4722202468

README.md

@@ -37,8 +37,6 @@
   </a>
   </div>
 
-This is a library that allows users use blockbench particle files in **Vanilla Minecraft**!
-
 With this library, you can design particle animations with [snowstorm](https://snowstorm.app/) and draw them in a Minecraft world.
 
 Currently only [Minestom](https://github.com/Minestom/Minestom) is supported.

src/main/java/emitters/lifetime/EmitterLifetimeLooping.java

@@ -35,11 +35,11 @@ public static EmitterLifetime parse(JsonObject asJsonObject) throws InvocationTa
     public LifetimeState getState(ParticleInterface i) {
         if (waitTicks <= 0) {
             if (active) {
-                waitTicks = (int) (2000 * sleepTime.evaluate(i));
+                waitTicks = (int) (i.updatesPerSecond() * sleepTime.evaluate(i));
                 active = false;
                 return LifetimeState.INACTIVE;
             } else {
-                waitTicks = (int) (2000 * activeTime.evaluate(i));
+                waitTicks = (int) (i.updatesPerSecond() * activeTime.evaluate(i));
                 active = true;
                 i.reset();
                 return LifetimeState.ALIVE;

src/main/java/emitters/rate/EmitterRateSteady.java

@@ -33,7 +33,7 @@ public static EmitterRate parse(JsonObject asJsonObject) throws InvocationTarget
     @Override
     public boolean canEmit(ParticleInterface emitter) {
         if (waitTicks <= 0) {
-            waitTicks = (int) (2000 / spawnRate.evaluate(emitter));
+            waitTicks = (int) (emitter.updatesPerSecond() / spawnRate.evaluate(emitter));
             return emitter.particle_count() < maxParticles.evaluate(emitter);
         } else {
             waitTicks--;

src/main/java/runtime/Parser.java

@@ -20,7 +20,7 @@
 import java.lang.reflect.InvocationTargetException;
 
 public class Parser {
-    public static ParticleEmitter parse(JsonObject description) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
+    public static ParticleEmitter parse(int updatesPerSecond, JsonObject description) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
         String version = description.get("format_version").getAsString();
         JsonObject particleEffect = description.get("particle_effect").getAsJsonObject();
         JsonObject components = particleEffect.get("components").getAsJsonObject();
@@ -84,6 +84,7 @@ public static ParticleEmitter parse(JsonObject description) throws InvocationTar
         JsonObject particleLifetimeExpression = components.get("minecraft:particle_lifetime_expression").getAsJsonObject();
 
         return new ParticleEmitter(
+                updatesPerSecond,
                 EmitterInitialization.parse(emitterInitialization),
                 EmitterLocalSpace.parse(emitterLocalSpace),
                 lifetime, rate, shape,

src/main/java/runtime/Particle.java

@@ -59,6 +59,11 @@ public void reset() {
         particle_age = 0;
     }
 
+    @Override
+    public int updatesPerSecond() {
+        return emitter.updatesPerSecond();
+    }
+
     @Query
     public double emitter_age() {
         return emitter.emitter_age();
@@ -121,7 +126,7 @@ public ParticlePacket draw(Vec start, Vec direction) throws InvocationTargetExce
     }
 
     public void tick() {
-        particle_age += 1 / 2000.0;
+        particle_age += 1.0 / updatesPerSecond();
     }
 
     public boolean isAlive() {

src/main/java/runtime/ParticleEmitter.java

@@ -20,6 +20,7 @@
 
 public class ParticleEmitter extends ParticleInterface {
     private Set<Particle> particles = new HashSet<>();
+    private final int updatesPerSecond;
 
     private double emitter_age;
     private final double emitter_random_1;
@@ -88,7 +89,7 @@ public void setPosition(Vec offset) {
         this.offset = offset;
     }
 
-    public ParticleEmitter(EmitterInitialization initialization, EmitterLocalSpace local_space,
+    public ParticleEmitter(int updatesPerSecond, EmitterInitialization initialization, EmitterLocalSpace local_space,
                            EmitterLifetime lifetime, EmitterRate rate, EmitterShape shape,
                            ParticleInitialSpeed particleSpeed, ParticleAppearanceTinting particleColour, ParticleLifetime particleLifetime) {
         this.emitter_age = 0;
@@ -108,6 +109,8 @@ public ParticleEmitter(EmitterInitialization initialization, EmitterLocalSpace l
         this.particleColour = particleColour;
         this.particleLifetime = particleLifetime;
 
+        this.updatesPerSecond = updatesPerSecond;
+
         initialization.initialize(this);
     }
 
@@ -117,8 +120,13 @@ public void reset() {
         initialization.initialize(this);
     }
 
+    @Override
+    public int updatesPerSecond() {
+        return updatesPerSecond;
+    }
+
     public Collection<ParticlePacket> tick() throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
-        emitter_age += 1.0/2000;
+        emitter_age += 1.0/updatesPerSecond;
 
         initialization.update(this);
         // particles.forEach(Particle::tick);

src/main/java/runtime/ParticleInterface.java

@@ -27,4 +27,5 @@ public abstract class ParticleInterface {
     abstract public int particle_count();
 
     public abstract void reset();
+    public abstract int updatesPerSecond();
 }

src/test/java/Demo.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws FileNotFoundException, Unsupported
             FileInputStream fis = new FileInputStream(file);
             JsonReader reader = new JsonReader(new InputStreamReader(fis, "UTF-8"));
             JsonObject map = GSON.fromJson(reader, JsonObject.class);
-            emitters.add(Parser.parse(map));
+            emitters.add(Parser.parse(2000, map));
         }
 
         // Add an event callback to specify the spawning instance (and the spawn position)

src/test/java/ParserTest.java

@@ -22,7 +22,7 @@ public void parseMagic() throws IOException, InvocationTargetException, NoSuchMe
         FileInputStream fis = new FileInputStream(file);
         JsonReader reader = new JsonReader(new InputStreamReader(fis, "UTF-8"));
         JsonObject map = GSON.fromJson(reader, JsonObject.class);
-        ParticleEmitter emitter = Parser.parse(map);
+        ParticleEmitter emitter = Parser.parse(1000, map);
     }
 
     @Test
@@ -31,6 +31,6 @@ public void parseLoading() throws IOException, InvocationTargetException, NoSuch
         FileInputStream fis = new FileInputStream(file);
         JsonReader reader = new JsonReader(new InputStreamReader(fis, "UTF-8"));
         JsonObject map = GSON.fromJson(reader, JsonObject.class);
-        ParticleEmitter emitter = Parser.parse(map);
+        ParticleEmitter emitter = Parser.parse(1000, map);
     }
 }