From 341383bd4267161683f21071825544b7008f2d1c Mon Sep 17 00:00:00 2001
From: PolyacovYury <kuf-1@yandex.ru>
Date: Mon, 5 Nov 2018 22:57:52 +0300
Subject: [PATCH] Removed redundand texture shift for left and legacy wings
 (and cleaned code that made it possible)

---
 .../com/minelittlepony/model/components/BatWings.java     | 6 ++----
 .../com/minelittlepony/model/components/BugWings.java     | 6 ++----
 .../com/minelittlepony/model/components/ModelBatWing.java | 4 ++--
 .../com/minelittlepony/model/components/ModelBugWing.java | 4 ++--
 .../com/minelittlepony/model/components/ModelWing.java    | 4 ++--
 .../com/minelittlepony/model/components/PegasusWings.java | 8 +++-----
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/minelittlepony/model/components/BatWings.java b/src/main/java/com/minelittlepony/model/components/BatWings.java
index c0cf4299..3945c8ff 100644
--- a/src/main/java/com/minelittlepony/model/components/BatWings.java
+++ b/src/main/java/com/minelittlepony/model/components/BatWings.java
@@ -13,10 +13,8 @@ public class BatWings<T extends AbstractPonyModel & IModelPegasus> extends Pegas
 
     @Override
     public void init(float yOffset, float stretch) {
-        int x = 57;
-
-        leftWing = new ModelBatWing<T>(pegasus, false, false, yOffset, stretch, x, 16);
-        rightWing = new ModelBatWing<T>(pegasus, true, false, yOffset, stretch, x - 1, 16);
+        leftWing = new ModelBatWing<>(pegasus, false, false, yOffset, stretch, 16);
+        rightWing = new ModelBatWing<>(pegasus, true, false, yOffset, stretch, 16);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/model/components/BugWings.java b/src/main/java/com/minelittlepony/model/components/BugWings.java
index 40f67c2c..c662950e 100644
--- a/src/main/java/com/minelittlepony/model/components/BugWings.java
+++ b/src/main/java/com/minelittlepony/model/components/BugWings.java
@@ -11,10 +11,8 @@ public class BugWings<T extends AbstractPonyModel & IModelPegasus> extends Pegas
 
     @Override
     public void init(float yOffset, float stretch) {
-        int x = 57;
-
-        leftWing = new ModelBugWing<T>(pegasus, false, false, yOffset, stretch, x, 16);
-        rightWing = new ModelBugWing<T>(pegasus, true, false, yOffset, stretch, x - 1, 16);
+        leftWing = new ModelBugWing<>(pegasus, false, false, yOffset, stretch, 16);
+        rightWing = new ModelBugWing<>(pegasus, true, false, yOffset, stretch, 16);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/model/components/ModelBatWing.java b/src/main/java/com/minelittlepony/model/components/ModelBatWing.java
index ce52e577..cf0cf76d 100644
--- a/src/main/java/com/minelittlepony/model/components/ModelBatWing.java
+++ b/src/main/java/com/minelittlepony/model/components/ModelBatWing.java
@@ -6,8 +6,8 @@ import com.minelittlepony.render.model.PlaneRenderer;
 
 public class ModelBatWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> {
 
-    public ModelBatWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) {
-        super(pegasus, right, legacy, y, scale, texX, texY);
+    public ModelBatWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
+        super(pegasus, right, legacy, y, scale, texY);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java b/src/main/java/com/minelittlepony/model/components/ModelBugWing.java
index 3aad94c0..bdcd6745 100644
--- a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java
+++ b/src/main/java/com/minelittlepony/model/components/ModelBugWing.java
@@ -6,8 +6,8 @@ import com.minelittlepony.render.model.PlaneRenderer;
 
 public class ModelBugWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> {
 
-    public ModelBugWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) {
-        super(pegasus, right, legacy, y, scale, texX, texY);
+    public ModelBugWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
+        super(pegasus, right, legacy, y, scale, texY);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/model/components/ModelWing.java b/src/main/java/com/minelittlepony/model/components/ModelWing.java
index c98ac623..6d3aa8d1 100644
--- a/src/main/java/com/minelittlepony/model/components/ModelWing.java
+++ b/src/main/java/com/minelittlepony/model/components/ModelWing.java
@@ -15,11 +15,11 @@ public class ModelWing<T extends AbstractPonyModel & IModelPegasus> implements P
     protected final PonyRenderer extended;
     protected final PonyRenderer folded;
 
-    public ModelWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) {
+    public ModelWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
         this.pegasus = pegasus;
 
         folded = new PonyRenderer(pegasus, 56, texY).mirror(legacy);
-        extended = new PonyRenderer(pegasus, texX, texY + 3);
+        extended = new PonyRenderer(pegasus, 56, texY + 3);
 
         addClosedWing(right, y, scale);
         addFeathers(right, legacy, y, scale);
diff --git a/src/main/java/com/minelittlepony/model/components/PegasusWings.java b/src/main/java/com/minelittlepony/model/components/PegasusWings.java
index 213c0f16..26e793a6 100644
--- a/src/main/java/com/minelittlepony/model/components/PegasusWings.java
+++ b/src/main/java/com/minelittlepony/model/components/PegasusWings.java
@@ -26,12 +26,10 @@ public class PegasusWings<T extends AbstractPonyModel & IModelPegasus> implement
 
     @Override
     public void init(float yOffset, float stretch) {
-        int x = 57;
+        leftWing = new ModelWing<>(pegasus, false, false, yOffset, stretch, 32);
+        rightWing = new ModelWing<>(pegasus, true, false, yOffset, stretch, 16);
 
-        leftWing = new ModelWing<>(pegasus, false, false, yOffset, stretch, x, 32);
-        rightWing = new ModelWing<>(pegasus, true, false, yOffset, stretch, x - 1, 16);
-
-        legacyWing = new ModelWing<>(pegasus, true, true, yOffset, stretch, x, 32);
+        legacyWing = new ModelWing<>(pegasus, true, true, yOffset, stretch, 32);
     }
 
     public ModelWing<T> getLeft() {