Math3DUtil支持计算获取由 getCycloidGraphic方法生成的图像的顶点(点速度最小时)坐标集合

Math3DUtil.computeCycloidVertices()
重命名方法参数名字radiusPrecision 为 scale

由于考虑到多个不同的粒子可能会出现在同一个位置上，为了适配这个，故将
ControlableParticleGroup.loadParticleLocations() 方法的返回值
由 Map<RelativeLocation, ParticleRelativeData>
更改为 Map<ParticleRelativeData, RelativeLocation>

Author: CooStack

README.md

@@ -124,15 +124,14 @@ class TestGroupClient(uuid: UUID, val bindPlayer: UUID) : ControlableParticleGro
     }
 
     // 魔法阵粒子组合
-    override fun loadParticleLocations(): Map<RelativeLocation, ParticleRelativeData> {
+    override fun loadParticleLocations(): Map<ParticleRelativeData, RelativeLocation> {
         // 在XZ平面的魔法阵
         val list = Math3DUtil.getCycloidGraphic(3.0, 5.0, 2, -3, 360, 0.2).onEach { it.y += 6 }
-        // 
-        return list.associateWith {
+        return list.associateBy {
             withEffect({
                 // 提供ParticleEffect (在display方法中 world.addParticle)使用
                 // it类型为UUID
-                TestEndRodEffect(it)
+                TestEndRodEffect(it) 
             }) {
                 // this is ControlableParticle
                 // 用于初始化粒子信息

gradle.properties

@@ -10,9 +10,9 @@ loader_version=0.16.10
 fabric_kotlin_version=1.13.1+kotlin.2.1.10
 
 # Mod Properties
-mod_version=1.0.0
+mod_version=1.1
 maven_group=cn.coostack
-archives_base_name=cooparticlesapi
+archives_base_name=coo-particles-api
 
 # Dependencies
 fabric_version=0.115.1+1.21.1

src/main/java/cn/coostack/mixin/ParticleManagerMixin.java

@@ -2,6 +2,7 @@
 
 
 import cn.coostack.CooParticleAPI;
+import cn.coostack.config.APIConfigManager;
 import com.google.common.collect.EvictingQueue;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleManager;
@@ -24,13 +25,18 @@ public abstract class ParticleManagerMixin {
 
     @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Ljava/util/Queue;poll()Ljava/lang/Object;"))
     public Object changeMaxParticles(Queue<Object> queue) {
-        Particle particle;
-        while ((particle = this.getNewParticles().poll()) != null) {
-            Map<ParticleTextureSheet, Queue<Particle>> particles = this.getParticles();
-            particles.computeIfAbsent(particle.getType(),
-                            sheet -> EvictingQueue.create(CooParticleAPI.MAX_PARTICLE_COUNT))
-                    .add(particle);
+        if (APIConfigManager.getConfig().getEnabledParticleCountInject()) {
+            Particle particle;
+            while ((particle = this.getNewParticles().poll()) != null) {
+                Map<ParticleTextureSheet, Queue<Particle>> particles = this.getParticles();
+                particles.computeIfAbsent(particle.getType(),
+                                sheet -> EvictingQueue.create(APIConfigManager.getConfig().getParticleCountLimit()))
+                        .add(particle);
+            }
+            return null;
+        } else {
+            // 恢复原来的功能
+            return this.getNewParticles().poll();
         }
-        return null;
     }
 }

src/main/kotlin/cn/coostack/CooParticleAPI.kt

@@ -1,5 +1,7 @@
 package cn.coostack
 
+import cn.coostack.config.APIConfig
+import cn.coostack.config.APIConfigManager
 import cn.coostack.items.CooItems
 import cn.coostack.items.group.CooItemGroup
 import cn.coostack.network.packet.PacketParticleGroupS2C
@@ -21,7 +23,6 @@ object CooParticleAPI : ModInitializer {
 
     const val MOD_ID = "cooparticleapi"
 
-    const val MAX_PARTICLE_COUNT = 65536
 
     lateinit var server: MinecraftServer
 
@@ -53,6 +54,7 @@ object CooParticleAPI : ModInitializer {
     override fun onInitialize() {
         CooItemGroup.reg()
         CooItems.reg()
+        APIConfigManager.loadConfig()
         ServerTickEvents.START_SERVER_TICK.register { _ ->
             ServerParticleGroupManager.upgrade()
         }

src/main/kotlin/cn/coostack/config/APIConfig.kt

@@ -0,0 +1,15 @@
+package cn.coostack.config
+
+class APIConfig {
+    /**
+     * 是否启用ParticleManagerMixin 对粒子数量上限进行修改
+     * (对其他插件进行兼容)
+     */
+    var enabledParticleCountInject = true
+
+    /**
+     * 粒子数量上限
+     * 原版上限为65536
+     */
+    var particleCountLimit = 65536
+}

src/main/kotlin/cn/coostack/config/APIConfigManager.kt

@@ -0,0 +1,40 @@
+package cn.coostack.config
+
+import cn.coostack.CooParticleAPI
+import com.google.gson.GsonBuilder
+import net.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil.GSON
+import net.fabricmc.loader.api.FabricLoader
+import org.apache.commons.compress.harmony.pack200.PackingUtils.config
+import java.nio.file.Files
+
+
+object APIConfigManager {
+    private val gson = GsonBuilder().setPrettyPrinting().create()
+    private val path = FabricLoader.getInstance().configDir.resolve("${CooParticleAPI.MOD_ID}.json")
+    @JvmStatic
+    private var withConfig: APIConfig? = null
+    @JvmStatic
+    fun getConfig(): APIConfig {
+        return withConfig ?: let {
+            loadConfig()
+            withConfig!!
+        }
+    }
+    @JvmStatic
+    fun loadConfig() {
+        if (!Files.exists(path)) {
+            withConfig = APIConfig()
+            saveConfig()
+            return
+        }
+        withConfig = gson.fromJson(Files.readString(path), APIConfig::class.java)
+    }
+
+    @JvmStatic
+    fun saveConfig() {
+        withConfig ?: return
+        val json = gson.toJson(withConfig)
+        Files.writeString(path, json)
+    }
+
+}

src/main/kotlin/cn/coostack/particles/control/group/ControlableParticleGroup.kt

@@ -55,10 +55,11 @@ abstract class ControlableParticleGroup(val uuid: UUID) {
     var displayed = false
 
     /**
-     * value代表的是 ParticleControler的初始化函数
-     * @see ParticleControler.initInvoker value最终赋值到这里
+     * key代表的是 ParticleControler的初始化函数
+     * @see ParticleControler.initInvoker key最终赋值到这里
+     * 考虑到不同的粒子可能会存在于相同的位置，因此做此修改
      */
-    abstract fun loadParticleLocations(): Map<RelativeLocation, ParticleRelativeData>
+    abstract fun loadParticleLocations(): Map<ParticleRelativeData, RelativeLocation>
 
     /**
      * 每次客户端更新可见时都会执行一次这个方法
@@ -97,7 +98,7 @@ abstract class ControlableParticleGroup(val uuid: UUID) {
         this.origin = pos
         this.world = world
         displayed = true
-        for ((rl, v) in particleRelativeLocations) {
+        for ((v, rl) in particleRelativeLocations) {
             val uuid = UUID.randomUUID()
             val controler = ControlParticleManager.createControl(uuid)
             controler.initInvoker = v.invoker

src/main/kotlin/cn/coostack/particles/control/group/impl/TestGroupClient.kt

@@ -23,14 +23,15 @@ class TestGroupClient(uuid: UUID, val bindPlayer: UUID) : ControlableParticleGro
         }
     }
 
-    override fun loadParticleLocations(): Map<RelativeLocation, ParticleRelativeData> {
+    override fun loadParticleLocations(): Map<ParticleRelativeData, RelativeLocation> {
         val list = Math3DUtil.getCycloidGraphic(3.0, 5.0, 2, -3, 360, 0.2).onEach { it.y += 6 }
-        return list.associateWith {
+        return list.associateBy {
             withEffect({ TestEndRodEffect(it) }) {
                 color = Vector3f(230 / 255f, 130 / 255f, 60 / 255f)
                 this.maxAliveTick = this.maxAliveTick
             }
         }
+
     }