From 5c9258491f0f0e50cb049ee9b3d9c4a23daeac15 Mon Sep 17 00:00:00 2001 From: Dennis C Date: Sun, 30 Jan 2022 15:26:03 +0100 Subject: [PATCH] Fix comparison of custom ParticleRenderTypes leading to broken particle effects. (#8385) --- .../client/ForgeHooksClient.java | 6 +++- .../rendering/CustomParticleTypeTest.java | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 967ec41053..ba25f21c3e 100755 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -1074,7 +1074,11 @@ public class ForgeHooksClient { return vanillaComparator.compare(typeOne, typeTwo); } - return Boolean.compare(vanillaTwo, vanillaOne); + if (!vanillaOne && !vanillaTwo) + { + return Integer.compare(System.identityHashCode(typeOne), System.identityHashCode(typeTwo)); + } + return vanillaOne ? -1 : 1; }; } } diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/CustomParticleTypeTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/CustomParticleTypeTest.java index 2aad6e6113..7881516e0d 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/CustomParticleTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/CustomParticleTypeTest.java @@ -58,6 +58,21 @@ public class CustomParticleTypeTest ParticleRenderType.TERRAIN_SHEET.end(tess); } }; + private static final ParticleRenderType CUSTOM_TYPE_TWO = new ParticleRenderType() + { + @Override + public void begin(BufferBuilder buffer, TextureManager texMgr) + { + Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer(); + ParticleRenderType.TERRAIN_SHEET.begin(buffer, texMgr); + } + + @Override + public void end(Tesselator tess) + { + ParticleRenderType.TERRAIN_SHEET.end(tess); + } + }; private static class CustomParticle extends TerrainParticle { @@ -72,6 +87,19 @@ public class CustomParticleTypeTest return CUSTOM_TYPE; } } + private static class AnotherCustomParticle extends TerrainParticle + { + public AnotherCustomParticle(ClientLevel level, double x, double y, double z) + { + super(level, x, y, z, 0, .25, 0, Blocks.SAND.defaultBlockState()); + } + + @Override + public ParticleRenderType getRenderType() + { + return CUSTOM_TYPE_TWO; + } + } @SubscribeEvent public static void onClientTick(final TickEvent.ClientTickEvent event) @@ -83,6 +111,7 @@ public class CustomParticleTypeTest if (player == null || level == null || !player.isShiftKeyDown()) { return; } Minecraft.getInstance().particleEngine.add(new CustomParticle(level, player.getX(), player.getY(), player.getZ())); + Minecraft.getInstance().particleEngine.add(new AnotherCustomParticle(level, player.getX(), player.getY(), player.getZ())); } } }