From 4123ee8c6ec98226a720ce23206e4714cca029ca Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 4 Jun 2018 19:34:31 +0200
Subject: [PATCH] Resolve naming clash between IModelPart and ModelRenderer

---
 .../java/com/minelittlepony/model/AbstractPonyModel.java     | 2 +-
 .../com/minelittlepony/model/capabilities/IModelPart.java    | 2 +-
 .../com/minelittlepony/model/components/PegasusWings.java    | 2 +-
 .../java/com/minelittlepony/model/components/PonyTail.java   | 5 +++++
 .../com/minelittlepony/model/components/SeaponyTail.java     | 2 +-
 .../java/com/minelittlepony/model/player/ModelAlicorn.java   | 2 +-
 .../java/com/minelittlepony/model/player/ModelPegasus.java   | 2 +-
 .../java/com/minelittlepony/model/ponies/ModelSeapony.java   | 2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index e11594f3..c84ef200 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -738,7 +738,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
         }
         upperTorso.render(scale);
         bipedBody.postRender(scale);
-        tail.render(scale);
+        tail.renderPart(scale);
     }
 
     protected void renderLegs(float scale) {
diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java b/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java
index f1bddfe3..44fc636e 100644
--- a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java
+++ b/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java
@@ -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.
diff --git a/src/main/java/com/minelittlepony/model/components/PegasusWings.java b/src/main/java/com/minelittlepony/model/components/PegasusWings.java
index 49bc8415..a6da76c8 100644
--- a/src/main/java/com/minelittlepony/model/components/PegasusWings.java
+++ b/src/main/java/com/minelittlepony/model/components/PegasusWings.java
@@ -66,7 +66,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);
diff --git a/src/main/java/com/minelittlepony/model/components/PonyTail.java b/src/main/java/com/minelittlepony/model/components/PonyTail.java
index c7a50f41..ee58f1ed 100644
--- a/src/main/java/com/minelittlepony/model/components/PonyTail.java
+++ b/src/main/java/com/minelittlepony/model/components/PonyTail.java
@@ -79,6 +79,11 @@ public class PonyTail extends PlaneRenderer implements IModelPart {
         isHidden = !visible;
     }
 
+    @Override
+    public void renderPart(float scale) {
+        this.render(scale);
+    }
+
     private class TailSegment extends PlaneRenderer {
 
         private final int index;
diff --git a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java b/src/main/java/com/minelittlepony/model/components/SeaponyTail.java
index af6fbf49..0cdc1d9f 100644
--- a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java
+++ b/src/main/java/com/minelittlepony/model/components/SeaponyTail.java
@@ -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();
diff --git a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
index 0ee19fd8..675cecb6 100644
--- a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
+++ b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
@@ -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);
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/model/player/ModelPegasus.java b/src/main/java/com/minelittlepony/model/player/ModelPegasus.java
index cae65052..dc8e8aed 100644
--- a/src/main/java/com/minelittlepony/model/player/ModelPegasus.java
+++ b/src/main/java/com/minelittlepony/model/player/ModelPegasus.java
@@ -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);
     }
 }
diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java
index cab34a7d..14732fb3 100644
--- a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java
+++ b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java
@@ -114,7 +114,7 @@ public class ModelSeapony extends ModelUnicorn {
         bodyCenter.render(scale);
         bipedBody.postRender(scale);
 
-        tail.render(scale);
+        tail.renderPart(scale);
 
         GlStateManager.enableBlend();