From 803e79343d2a38ee11faefba1b4a1d6cfe4a544f Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 10 Jun 2018 19:49:28 +0200 Subject: [PATCH] Rename PonyRenderer.flipX -> PonyRenderer.flip to better reflect its meaning --- src/main/java/com/minelittlepony/model/AbstractPonyModel.java | 2 +- .../java/com/minelittlepony/model/armour/ModelPonyArmor.java | 4 ++-- .../java/com/minelittlepony/model/components/PonyElytra.java | 2 +- .../java/com/minelittlepony/model/components/SeaponyTail.java | 4 ++-- .../java/com/minelittlepony/model/ponies/ModelSeapony.java | 2 +- .../java/com/minelittlepony/render/AbstractPonyRenderer.java | 2 +- src/main/java/com/minelittlepony/render/PonyRenderer.java | 1 - src/main/java/com/minelittlepony/render/plane/ModelPlane.java | 4 ++-- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index c84ef200..b31db05f 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -533,7 +533,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { .box(-4, -4, -4, 8, 8, 8, stretch) .tex(12, 16) .box(-4, -6, 1, 2, 2, 2, stretch) - .flipX() + .flip() .box(2, -6, 1, 2, 2, 2, stretch); ((PonyRenderer)bipedHeadwear).offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z) diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java index bf3f7087..6b2d32bd 100644 --- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java +++ b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java @@ -60,10 +60,10 @@ public class ModelPonyArmor extends AbstractPonyModel { protected void initLegTextures() { super.initLegTextures(); - bipedLeftArm = new PonyRenderer(this, 0, 16).flipX(); + bipedLeftArm = new PonyRenderer(this, 0, 16).flip(); bipedRightArm = new PonyRenderer(this, 0, 16); - bipedLeftLeg = new PonyRenderer(this, 0, 16).flipX(); + bipedLeftLeg = new PonyRenderer(this, 0, 16).flip(); bipedRightLeg = new PonyRenderer(this, 0, 16); } diff --git a/src/main/java/com/minelittlepony/model/components/PonyElytra.java b/src/main/java/com/minelittlepony/model/components/PonyElytra.java index 518fc2fe..85a460df 100644 --- a/src/main/java/com/minelittlepony/model/components/PonyElytra.java +++ b/src/main/java/com/minelittlepony/model/components/PonyElytra.java @@ -20,7 +20,7 @@ public class PonyElytra extends ModelBase { public PonyElytra() { leftWing .box(-10, 0, 0, 10, 20, 2, 1); - rightWing.flipX().box( 0, 0, 0, 10, 20, 2, 1); + rightWing.flip().box( 0, 0, 0, 10, 20, 2, 1); } /** diff --git a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java b/src/main/java/com/minelittlepony/model/components/SeaponyTail.java index 0cdc1d9f..f3919f25 100644 --- a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java +++ b/src/main/java/com/minelittlepony/model/components/SeaponyTail.java @@ -31,14 +31,14 @@ public class SeaponyTail implements IModelPart { @Override public void init(float yOffset, float stretch) { tailBase.rotate(TAIL_ROTX, 0, 0).around(-2, 14, 8) - .box( 0, 0, 0, 4, 6, 4, stretch).flipX(); + .box( 0, 0, 0, 4, 6, 4, stretch).flip(); tailTip.rotate(0, 0, 0).around(1, 5, 1) .box(0, 0, 0, 2, 6, 1, stretch); tailFins.offset(1, 0, 4).rotate(-TAIL_ROTX, 0, 0) .addTopPlane(-8, 0, 0, 8, 8, stretch) - .flipX().addTopPlane( 0, 0, 0, 8, 8, stretch); + .flip().addTopPlane( 0, 0, 0, 8, 8, stretch); } @Override diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java index 14732fb3..31616aa0 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java @@ -69,7 +69,7 @@ public class ModelSeapony extends ModelUnicorn { protected void initBodyPositions(float yOffset, float stretch) { super.initBodyPositions(yOffset, stretch); bodyCenter.around(0, 6, 1) - .box(-3, -1, 0, 6, 7, 9, stretch).flipX(); + .box(-3, -1, 0, 6, 7, 9, stretch).flip(); } @Override diff --git a/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java b/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java index 6748e0e8..3097fef9 100644 --- a/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java +++ b/src/main/java/com/minelittlepony/render/AbstractPonyRenderer.java @@ -43,7 +43,7 @@ public abstract class AbstractPonyRenderer> ex /** * Flips the mirror flag. All faces are mirrored until this is called again. */ - public T flipX() { + public T flip() { return mirror(!mirror); } diff --git a/src/main/java/com/minelittlepony/render/PonyRenderer.java b/src/main/java/com/minelittlepony/render/PonyRenderer.java index c2031230..cfa33b8b 100644 --- a/src/main/java/com/minelittlepony/render/PonyRenderer.java +++ b/src/main/java/com/minelittlepony/render/PonyRenderer.java @@ -16,5 +16,4 @@ public class PonyRenderer extends AbstractPonyRenderer { protected PonyRenderer copySelf() { return new PonyRenderer(baseModel, textureOffsetX, textureOffsetY); } - } diff --git a/src/main/java/com/minelittlepony/render/plane/ModelPlane.java b/src/main/java/com/minelittlepony/render/plane/ModelPlane.java index ebf41c03..8a7c8716 100644 --- a/src/main/java/com/minelittlepony/render/plane/ModelPlane.java +++ b/src/main/java/com/minelittlepony/render/plane/ModelPlane.java @@ -76,7 +76,7 @@ public class ModelPlane extends Box { } @Override - public void render(@Nonnull BufferBuilder renderer, float scale) { - if (!hidden) quad.draw(renderer, scale); + public void render(@Nonnull BufferBuilder buffer, float scale) { + if (!hidden) quad.draw(buffer, scale); } }