fire event alongside the AddLayers event

MinecraftForge · May 16, 2023 · a6d5724 · a6d5724
1 parent e51ac23
commit a6d5724
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java.patch
@@ -15,7 +15,7 @@
              p_114442_.m_85836_();
              double d3 = d0 + Mth.m_14139_((double)p_114445_, enderdragonpart.f_19790_, enderdragonpart.m_20185_());
              double d4 = d1 + Mth.m_14139_((double)p_114445_, enderdragonpart.f_19791_, enderdragonpart.m_20186_());
-@@ -335,9 +_,14 @@
+@@ -335,9 +_,15 @@
        return this.f_234577_;
     }
 
@@ -28,5 +28,6 @@
        this.f_114362_ = EntityRenderers.m_174049_(entityrendererprovider$context);
        this.f_114363_ = EntityRenderers.m_174051_(entityrendererprovider$context);
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.AddLayers(f_114362_, f_114363_));
++      net.minecraftforge.client.model.pose.PoseSortingRegistry.init();
     }
  }
diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -276,7 +276,6 @@ public static void init()
         NamedRenderTypeManager.init();
         ColorResolverManager.init();
         ItemDecoratorHandler.init();
-        PoseSortingRegistry.init();
     }
 
     public static String getArmorTexture(Entity entity, ItemStack armor, String _default, EquipmentSlot slot, String type)

diff --git a/src/main/java/net/minecraftforge/client/model/pose/PoseSortingRegistry.java b/src/main/java/net/minecraftforge/client/model/pose/PoseSortingRegistry.java
@@ -97,6 +97,8 @@ private static void recalculatePoses()
 
     public static void init()
     {
+        poses.clear();
+        edges.clear();
         EntityRenderersEvent.RegisterPoseEvent event = new EntityRenderersEvent.RegisterPoseEvent(PoseSortingRegistry::registerPose);
         ModLoader.get().postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
         recalculatePoses();