mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2025-02-13 16:24:23 +01:00
Naming collusion between MCP:ModelRenderer.render and MLP:IModelPart.render
This commit is contained in:
parent
086ff5a677
commit
5f8b0cf395
8 changed files with 12 additions and 7 deletions
|
@ -778,7 +778,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
|
|||
}
|
||||
upperTorso.render(scale);
|
||||
bipedBody.postRender(scale);
|
||||
tail.render(scale);
|
||||
tail.renderPart(scale);
|
||||
}
|
||||
|
||||
protected void renderLegs() {
|
||||
|
|
|
@ -18,7 +18,7 @@ public interface IModelPart {
|
|||
/**
|
||||
* Renders this model component.
|
||||
*/
|
||||
void render(float scale);
|
||||
void renderPart(float scale);
|
||||
|
||||
/**
|
||||
* Sets whether this part should be rendered.
|
||||
|
|
|
@ -63,7 +63,7 @@ public class PegasusWings implements IModelPart {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void render(float scale) {
|
||||
public void renderPart(float scale) {
|
||||
boolean standing = pegasus.wingsAreOpen();
|
||||
leftWing.render(standing, scale);
|
||||
rightWing.render(standing, scale);
|
||||
|
|
|
@ -79,6 +79,11 @@ public class PonyTail extends PlaneRenderer implements IModelPart {
|
|||
isHidden = !visible;
|
||||
}
|
||||
|
||||
|
||||
public void renderPart(float scale) {
|
||||
render(scale);
|
||||
}
|
||||
|
||||
private class TailSegment extends PlaneRenderer {
|
||||
|
||||
private final int index;
|
||||
|
|
|
@ -53,7 +53,7 @@ public class SeaponyTail implements IModelPart {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void render(float scale) {
|
||||
public void renderPart(float scale) {
|
||||
GlStateManager.enableBlend();
|
||||
tailBase.render(scale);
|
||||
GlStateManager.disableBlend();
|
||||
|
|
|
@ -32,7 +32,7 @@ public class ModelAlicorn extends ModelUnicorn implements IModelPegasus {
|
|||
protected void renderBody(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) {
|
||||
super.renderBody(entity, move, swing, ticks, headYaw, headPitch, scale);
|
||||
if (canFly()) {
|
||||
wings.render(scale);
|
||||
wings.renderPart(scale);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,6 +28,6 @@ public class ModelPegasus extends ModelEarthPony implements IModelPegasus {
|
|||
@Override
|
||||
protected void renderBody(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) {
|
||||
super.renderBody(entity, move, swing, ticks, headYaw, headPitch, scale);
|
||||
wings.render(scale);
|
||||
wings.renderPart(scale);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -114,7 +114,7 @@ public class ModelSeapony extends ModelUnicorn {
|
|||
bodyCenter.render(scale);
|
||||
bipedBody.postRender(scale);
|
||||
|
||||
tail.render(scale);
|
||||
tail.renderPart(scale);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
|
|
Loading…
Reference in a new issue