Add a method to render a spell using the dispatcher

Sollace · Jan 21, 2024 · e09ade5 · e09ade5
1 parent 3827deb
commit e09ade5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/spell/PlacedSpellRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/spell/PlacedSpellRenderer.java
@@ -72,10 +72,7 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertices, Placea
 
             matrices.pop();
 
-            var renderer = SpellEffectsRenderDispatcher.INSTANCE.getRenderer(delegate);
-            if (renderer != null) {
-                renderer.render(matrices, vertices, spell, caster, light, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
-            }
+            SpellEffectsRenderDispatcher.INSTANCE.render(matrices, vertices, delegate, caster, light, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
         }
     }
 

diff --git a/...in/java/com/minelittlepony/unicopia/client/render/spell/SpellEffectsRenderDispatcher.java b/...in/java/com/minelittlepony/unicopia/client/render/spell/SpellEffectsRenderDispatcher.java
@@ -64,12 +64,16 @@ public <S extends Spell> SpellRenderer<S> getRenderer(S spell) {
         return (SpellRenderer<S>)renderers.get(spell.getType());
     }
 
+    public void render(MatrixStack matrices, VertexConsumerProvider vertices, Spell spell, Caster<?> caster, int light, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
+        var renderer = getRenderer(spell);
+        if (renderer != null) {
+            renderer.render(matrices, vertices, spell, caster, light, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
+        }
+    }
+
     public void render(MatrixStack matrices, VertexConsumerProvider vertices, int light, Caster<?> caster, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
         caster.getSpellSlot().forEach(spell -> {
-            var renderer = getRenderer(spell);
-            if (renderer != null) {
-                renderer.render(matrices, vertices, spell, caster, light, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
-            }
+            render(matrices, vertices, spell, caster, light, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
             return Operation.SKIP;
         }, false);