fix

Author: USS-Shenzhou

gradle.properties

@@ -35,7 +35,7 @@ mod_name=MadParticle
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU GPL 3.0
 # The mod version. See https://semver.org/
-mod_version=26.1.2-4
+mod_version=26.1.2-5
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/cn/ussshenzhou/madparticle/mixin/compat/IrisFinalPassRendererMixin.java

@@ -18,8 +18,7 @@ public class IrisFinalPassRendererMixin {
     @Inject(method = "renderFinalPass", at = @At(value = "INVOKE", target = "Lnet/irisshaders/iris/gl/GLDebug;popGroup()V", shift = At.Shift.BEFORE), require = 0)
     private void madparticleRender(CallbackInfo ci) {
         if (MadParticle.irisOn) {
-            NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED).render();
-            NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED_TERRAIN).render();
+            NeoInstancedRenderManager.forEach(NeoInstancedRenderManager::render);
         }
     }
 }

src/main/java/cn/ussshenzhou/madparticle/particle/enums/TakeOver.java

@@ -7,7 +7,6 @@
 import com.google.common.collect.Sets;
 import com.mojang.logging.LogUtils;
 import net.minecraft.client.particle.*;
-import net.minecraft.world.level.block.Block;
 import org.jspecify.annotations.Nullable;
 
 import java.util.HashSet;
@@ -91,12 +90,14 @@ public enum TakeOver implements ITranslatable {
     );
     @SuppressWarnings("unchecked")
     private static final HashSet<Class<? extends Particle>> RENDER_BLACKLIST = Sets.newHashSet(
-            //TODO support item atlas
+    );
+
+    private static final HashSet<Class<? extends SingleQuadParticle>> ITEM_ATLAS = Sets.newHashSet(
             BlockMarker.class,
             BreakingItemParticle.class
     );
     @SuppressWarnings("unchecked")
-    private static final HashSet<Class<? extends SingleQuadParticle>> RENDER_VANILLA = Sets.newHashSet(
+    private static final HashSet<Class<? extends SingleQuadParticle>> PARTICLE_ATLAS = Sets.newHashSet(
             SnowflakeParticle.class,
             SpitParticle.class,
             SpellParticle.class,
@@ -160,25 +161,34 @@ public static ParticleRenderType map(Particle particle) {
         if (!(particle instanceof SingleQuadParticle)) {
             return originalType;
         }
-        if (originalType == ModParticleRenderTypes.INSTANCED || originalType == ModParticleRenderTypes.INSTANCED_TERRAIN) {
+        if (originalType == ModParticleRenderTypes.INSTANCED || originalType == ModParticleRenderTypes.INSTANCED_TERRAIN || originalType == ModParticleRenderTypes.INSTANCED_ITEM) {
             return originalType;
         }
         return switch (originalType.name()) {
             case "INSTANCED" -> ModParticleRenderTypes.INSTANCED;
             case "INSTANCED_TERRAIN" -> ModParticleRenderTypes.INSTANCED_TERRAIN;
+            case "INSTANCED_ITEM" -> ModParticleRenderTypes.INSTANCED_ITEM;
             case "SINGLE_QUADS" -> switch (ConfigHelper.getConfigRead(MadParticleConfig.class).takeOverRendering) {
                 case NONE -> originalType;
                 case ALL -> {
-                    if (particle instanceof TerrainParticle) {
+                    if (RENDER_BLACKLIST.contains(particle.getClass())) {
+                        yield ParticleRenderType.SINGLE_QUADS;
+                    } else if (particle instanceof TerrainParticle) {
                         yield ModParticleRenderTypes.INSTANCED_TERRAIN;
+                    } else if (ITEM_ATLAS.contains(particle.getClass())) {
+                        yield ModParticleRenderTypes.INSTANCED_ITEM;
                     }
-                    yield RENDER_BLACKLIST.contains(particle.getClass()) ? ParticleRenderType.SINGLE_QUADS : ModParticleRenderTypes.INSTANCED;
+                    yield ModParticleRenderTypes.INSTANCED;
                 }
                 case VANILLA -> {
                     if (particle instanceof TerrainParticle) {
                         yield ModParticleRenderTypes.INSTANCED_TERRAIN;
+                    } else if (ITEM_ATLAS.contains(particle.getClass())) {
+                        yield ModParticleRenderTypes.INSTANCED_ITEM;
+                    } else if (PARTICLE_ATLAS.contains(particle.getClass())) {
+                        yield ModParticleRenderTypes.INSTANCED;
                     }
-                    yield RENDER_VANILLA.contains(particle.getClass()) ? ModParticleRenderTypes.INSTANCED : originalType;
+                    yield originalType;
                 }
             };
             default -> originalType;

src/main/java/cn/ussshenzhou/madparticle/particle/enums/TakeOverType.java

@@ -14,6 +14,7 @@
 public enum TakeOverType implements ITranslatable {
     INSTANCED("gui.mp.de.helper.render_type.instanced"),
     INSTANCED_TERRAIN("gui.mp.de.helper.render_type.terrain"),
+    INSTANCED_ITEM("gui.mp.de.helper.render_type.item"),
     DEFAULT("gui.mp.de.helper.render_type.default");
 
     private final String translateKey;

src/main/java/cn/ussshenzhou/madparticle/particle/enums/TakeOverTypeUtilC.java

@@ -10,6 +10,7 @@ public static SingleQuadParticle.Layer getLayer(TakeOverType t) {
         return switch (t) {
             case INSTANCED, DEFAULT -> SingleQuadParticle.Layer.TRANSLUCENT;
             case INSTANCED_TERRAIN -> SingleQuadParticle.Layer.TRANSLUCENT_TERRAIN;
+            case INSTANCED_ITEM -> SingleQuadParticle.Layer.TRANSLUCENT_ITEMS;
         };
     }
 
@@ -18,6 +19,7 @@ public static ParticleRenderType getParticleRenderType(TakeOverType t) {
             case INSTANCED -> ModParticleRenderTypes.INSTANCED;
             case INSTANCED_TERRAIN -> ModParticleRenderTypes.INSTANCED_TERRAIN;
             case DEFAULT -> ParticleRenderType.SINGLE_QUADS;
+            case INSTANCED_ITEM -> ModParticleRenderTypes.INSTANCED_ITEM;
         };
     }
 }

src/main/java/cn/ussshenzhou/madparticle/particle/render/ModParticleRenderTypes.java

@@ -14,4 +14,6 @@ public class ModParticleRenderTypes {
     public static final ParticleRenderType INSTANCED = new ParticleRenderType("INSTANCED");
 
     public static final ParticleRenderType INSTANCED_TERRAIN = new ParticleRenderType("INSTANCED_TERRAIN");
+
+    public static final ParticleRenderType INSTANCED_ITEM = new ParticleRenderType("INSTANCED_ITEM");
 }

src/main/java/cn/ussshenzhou/madparticle/particle/render/NeoInstancedRenderManager.java

@@ -58,13 +58,16 @@ public NeoInstancedRenderManager(Identifier usingAtlas) {
     static final NeoInstancedRenderManager[] MANAGER_BY_RENDER_TYPE = new NeoInstancedRenderManager[]{
             new NeoInstancedRenderManager(TextureAtlas.LOCATION_PARTICLES),
             new NeoInstancedRenderManager(TextureAtlas.LOCATION_BLOCKS),
+            new NeoInstancedRenderManager(TextureAtlas.LOCATION_ITEMS),
     };
 
     public static NeoInstancedRenderManager getInstance(ParticleRenderType renderType) {
         if (renderType == ModParticleRenderTypes.INSTANCED) {
             return MANAGER_BY_RENDER_TYPE[0];
+        } else if (renderType == ModParticleRenderTypes.INSTANCED_TERRAIN) {
+            return MANAGER_BY_RENDER_TYPE[1];
         }
-        return MANAGER_BY_RENDER_TYPE[1];
+        return MANAGER_BY_RENDER_TYPE[2];
     }
 
     public static Stream<NeoInstancedRenderManager> getAllInstances() {
@@ -74,6 +77,7 @@ public static Stream<NeoInstancedRenderManager> getAllInstances() {
     public static void forEach(Consumer<? super NeoInstancedRenderManager> consumer) {
         consumer.accept(MANAGER_BY_RENDER_TYPE[0]);
         consumer.accept(MANAGER_BY_RENDER_TYPE[1]);
+        consumer.accept(MANAGER_BY_RENDER_TYPE[2]);
     }
 
     public static void init() {
@@ -140,8 +144,7 @@ public static void renderAtLast(RenderLevelStageEvent.AfterTranslucentParticles
         if (cn.ussshenzhou.madparticle.MadParticle.irisOn) {
             return;
         }
-        NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED).render();
-        NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED_TERRAIN).render();
+        forEach(NeoInstancedRenderManager::render);
     }
 
     @SubscribeEvent

src/main/java/cn/ussshenzhou/madparticle/particle/render/ParallelTickManager.java

@@ -96,11 +96,10 @@ public static void tick(ParticleEngine engine) {
         }
         removeAndAdd(engine);
         if (engine.particles.values().stream().mapToInt(ParticleGroup::size).sum() == 0) {
-            NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED).clear();
-            NeoInstancedRenderManager.getInstance(ModParticleRenderTypes.INSTANCED_TERRAIN).clear();
+            NeoInstancedRenderManager.forEach(NeoInstancedRenderManager::clear);
         }
         engine.particles.forEach((renderType, particles) -> {
-            if (renderType == ModParticleRenderTypes.INSTANCED || renderType == ModParticleRenderTypes.INSTANCED_TERRAIN) {
+            if (renderType == ModParticleRenderTypes.INSTANCED || renderType == ModParticleRenderTypes.INSTANCED_TERRAIN || renderType == ModParticleRenderTypes.INSTANCED_ITEM) {
                 NeoInstancedRenderManager.getInstance(renderType).update((MultiThreadedEqualObjectLinkedOpenHashSetQueue<Particle>) particles.particles);
             }
         });
@@ -129,7 +128,7 @@ public static void tick(ParticleEngine engine) {
                         failSafe(engine, e);
                     }
                     engine.particles.forEach((renderType, particleGroup) -> {
-                        if (renderType == ModParticleRenderTypes.INSTANCED || renderType == ModParticleRenderTypes.INSTANCED_TERRAIN) {
+                        if (renderType == ModParticleRenderTypes.INSTANCED || renderType == ModParticleRenderTypes.INSTANCED_TERRAIN || renderType == ModParticleRenderTypes.INSTANCED_ITEM) {
                             NeoInstancedRenderManager.getInstance(renderType).postUpdate((MultiThreadedEqualObjectLinkedOpenHashSetQueue<Particle>) particleGroup.particles);
                         }
                     });

src/main/java/cn/ussshenzhou/madparticle/particle/render/UtilListener.java

@@ -13,6 +13,6 @@ public class UtilListener {
 
     @SubscribeEvent
     public static void onLeaveLevel(LevelEvent.Unload event) {
-        //NeoInstancedRenderManager.getAllInstances().forEach(NeoInstancedRenderManager::clear);
+        NeoInstancedRenderManager.forEach(NeoInstancedRenderManager::clear);
     }
 }

src/main/resources/assets/madparticle/lang/en_us.json

@@ -1,5 +1,5 @@
 {
-  "key.categories.madparticle": "Mad Particle",
+  "key.category.madparticle.madparticle": "Mad Particle",
   "key.mp.call_de": "Call out MadParticle Designer",
   "key.mp.clear_de": "Clear MadParticle Designer",