update

Author: iam4722202468

build.gradle.kts

@@ -14,11 +14,10 @@ sourceSets {
 
 repositories {
     mavenCentral()
-    maven("https://jitpack.io")
 }
 
 description = "Particle Effects for WorldSeed"
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 tasks.jar {
     manifest {
@@ -51,10 +50,10 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
 
-    compileOnly("net.minestom:minestom-snapshots:5162a00b1e")
-    testImplementation("net.minestom:minestom-snapshots:5162a00b1e")
+    compileOnly("net.minestom:minestom-snapshots:f1d5940855")
+    testImplementation("net.minestom:minestom-snapshots:f1d5940855")
 
-    implementation("com.github.hollow-cube.common:mql:2b48ad430f")
+    implementation("dev.hollowcube:mql:1.0.1")
 }
 
 tasks.getByName<Test>("test") {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -4,8 +4,6 @@
 import net.minestom.server.coordinate.Vec;
 import net.minestom.server.network.packet.server.play.ParticlePacket;
 import net.minestom.server.particle.Particle;
-import net.minestom.server.particle.data.DustColorTransitionParticleData;
-import net.minestom.server.particle.data.DustParticleData;
 
 import java.util.Map;
 
@@ -19,7 +17,6 @@ public static ParticlePacket buildParticle(Particle particleType, double x, doub
         else if (particleType == Particle.DUST_COLOR_TRANSITION) return buildDustTransition(x, y, z, size, r, g, b, r2, g2, b2);
         else if (particleType == Particle.NOTE) return buildNote(x, y, z, r, g, b);
         else if (particleType == Particle.ENTITY_EFFECT) return buildEffect(x, y, z, r, g, b);
-        else if (particleType == Particle.AMBIENT_ENTITY_EFFECT) return buildEffectAmbient(x, y, z, r, g, b);
         else if (particleType == Particle.FLAME
                 || particleType == Particle.SMOKE
                 || particleType == Particle.FIREWORK
@@ -29,8 +26,8 @@ else if (particleType == Particle.FLAME
     }
 
     private static ParticlePacket buildDustTransition(double x, double y, double z, double size, double r, double g, double b, double r2, double g2, double b2) {
-        DustColorTransitionParticleData data = new DustColorTransitionParticleData(new Color((int) (r * 255), (int) (g * 255), (int) (b * 255)), (float) size, new Color((int) (r2 * 255), (int) (g2 * 255), (int) (b2 * 255)));
-        return new ParticlePacket(Particle.DUST_COLOR_TRANSITION.id(), true, x, y, z, 0, 0, 0, 0, 0, data);
+        Particle.DustColorTransition data = Particle.DUST_COLOR_TRANSITION.withProperties(new Color((int) (r * 255), (int) (g * 255), (int) (b * 255)), (float) size, new Color((int) (r2 * 255), (int) (g2 * 255), (int) (b2 * 255))) ;
+        return new ParticlePacket(data, true, x, y, z, 0, 0, 0, 0, 0);
     }
 
     private static ParticlePacket buildGeneric(Particle p, double x, double y, double z) {
@@ -42,20 +39,16 @@ private static ParticlePacket buildDirectional(Particle p, double x, double y, d
         double size = vec.length();
         vec = vec.normalize();
 
-        return new ParticlePacket(p.id(), true, x, y, z, (float) vec.x(), (float) vec.y(), (float) vec.z(), (float) size, 0, p.data());
+        return new ParticlePacket(p, true, x, y, z, (float) vec.x(), (float) vec.y(), (float) vec.z(), (float) size, 0);
     }
 
     private static ParticlePacket buildDust(double x, double y, double z, double size, double r, double g, double b) {
-        DustParticleData data = new DustParticleData(new Color((int) (r * 255), (int) (g * 255), (int) (b * 255)), (float) size);
-        return new ParticlePacket(Particle.DUST.id(), true, x, y, z, 0, 0, 0, 0, 0, data);
+        Particle.Dust data = Particle.DUST.withProperties(new Color((int) (r * 255), (int) (g * 255), (int) (b * 255)), (float) size);
+        return new ParticlePacket(data, true, x, y, z, 0, 0, 0, 0, 0);
     }
 
     private static ParticlePacket buildEffect(double x, double y, double z, double r, double g, double b) {
-        return new ParticlePacket(Particle.ENTITY_EFFECT.id(), true, x, y, z, (float) r, (float) g, (float) b, 1, 0, Particle.ENTITY_EFFECT.data());
-    }
-
-    private static ParticlePacket buildEffectAmbient(double x, double y, double z, double r, double g, double b) {
-        return new ParticlePacket(Particle.AMBIENT_ENTITY_EFFECT.id(), true, x, y, z, (float) r, (float) g, (float) b, 1, 0, Particle.AMBIENT_ENTITY_EFFECT.data());
+        return new ParticlePacket(Particle.ENTITY_EFFECT, true, x, y, z, (float) r, (float) g, (float) b, 1, 0);
     }
 
     private static final Map<Vec, Double> noteColours = Map.ofEntries(
@@ -79,6 +72,6 @@ private static double calculateMinDiff(double r, double g, double b) {
     }
 
     private static ParticlePacket buildNote(double x, double y, double z, double r, double g, double b) {
-        return new ParticlePacket(Particle.NOTE.id(), true, x, y, z, (float) (calculateMinDiff(r, g, b)), 0, 0, 1, 0, Particle.NOTE.data());
+        return new ParticlePacket(Particle.NOTE, true, x, y, z, (float) (calculateMinDiff(r, g, b)), 0, 0, 1, 0);
     }
 }

gradlew

@@ -23,9 +23,7 @@
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 public class Demo {
     static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
@@ -65,24 +63,26 @@ public static void main(String[] args) throws FileNotFoundException, Unsupported
             }
         });
 
-        MinecraftServer.getSchedulerManager().scheduleTask(() -> {
-            try {
-                for (var emitter : emitters) {
-                    Collection<ParticlePacket> packets = emitter.tick();
+        new Timer().schedule(new TimerTask() {
+            public void run()  {
+                try {
+                    for (var emitter : emitters) {
+                        Collection<ParticlePacket> packets = emitter.tick();
 
-                    if (emitter.status() != EmitterLifetime.LifetimeState.DEAD) {
-                        packets.forEach(packet -> {
-                            instanceContainer.getPlayers().forEach(p -> p.sendPackets(packet));
-                        });
-                    } else {
-                        emitter.reset();
+                        if (emitter.status() != EmitterLifetime.LifetimeState.DEAD) {
+                            packets.forEach(packet -> {
+                                instanceContainer.getPlayers().forEach(p -> p.sendPackets(packet));
+                            });
+                        } else {
+                            emitter.reset();
+                        }
                     }
+                } catch (InvocationTargetException | NoSuchMethodException | InstantiationException |
+                         IllegalAccessException e) {
+                    throw new RuntimeException(e);
                 }
-            } catch (InvocationTargetException | NoSuchMethodException | InstantiationException |
-                     IllegalAccessException e) {
-                throw new RuntimeException(e);
             }
-        }, TaskSchedule.immediate(), TaskSchedule.millis(1), ExecutionType.ASYNC);
+        }, 1, 1);
 
         // Start the server on port 25565
         minecraftServer.start("0.0.0.0", 25565);

gradlew.bat

@@ -2,7 +2,7 @@
 	"format_version": "1.10.0",
 	"particle_effect": {
 		"description": {
-			"identifier": "snowstorm:loading",
+			"identifier": "snowstorm:magic",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
 				"texture": "textures/particle/particles"
@@ -17,32 +17,43 @@
 				"spawn_rate": 500,
 				"max_particles": 1000
 			},
-			"minecraft:emitter_lifetime_looping": {
-				"active_time": 1
+			"minecraft:emitter_lifetime_expression": {
+				"activation_expression": 1
 			},
 			"minecraft:emitter_shape_disc": {
-				"radius": 2,
-				"plane_normal": [1, 1, 0],
+				"offset": ["math.sin(variable.emitter_age*200)*6", "math.cos(variable.emitter_age*260)*6", 5],
+				"radius": 1.6,
+				"plane_normal": ["math.sin(variable.emitter_age*200)*6", 0, 1],
 				"surface_only": true,
 				"direction": "outwards"
 			},
 			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 1
+				"max_lifetime": "math.random(3, 4)"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation_rate": "Math.random(-100, 100)"
 			},
 			"minecraft:particle_initial_speed": 0,
-			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["math.random(0, 4)", "math.random(0, 8)", "variable.particle_random_3>0.2 ? -10 : -4"]
+			},
 			"minecraft:particle_appearance_billboard": {
-				"size": ["0.08*(1-variable.particle_age)", "0.08*(1-variable.particle_age)"],
+				"size": ["0.04+variable.particle_random_2/5", "0.04+variable.particle_random_2/5"],
 				"facing_camera_mode": "rotate_xyz",
 				"uv": {
 					"texture_width": 128,
 					"texture_height": 128,
-					"uv": [32, 88],
-					"uv_size": [8, 8]
+					"flipbook": {
+						"base_UV": [64, 96],
+						"size_UV": [8, 8],
+						"step_UV": [-8, 0],
+						"max_frame": 8,
+						"stretch_to_lifetime": true
+					}
 				}
 			},
 			"minecraft:particle_appearance_tinting": {
-				"color": [0.41961, 1, 0.57647, 1]
+				"color": ["Math.clamp(0.3 + variable.particle_random_4/7 + (variable.particle_random_3>0.2 ? 0.4 : 0), 0, 1)", "Math.clamp(0.2+variable.particle_random_4/5, 0, 1)", "Math.clamp(0.88 + variable.particle_random_4/8, 0, 1)", 1]
 			}
 		}
 	}