From 86a772ee8cd44d715988fe3e8df507d72ad24a42 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Sun, 27 Nov 2016 10:01:26 +0000 Subject: [PATCH] Clean up handling of changes to IVertexConsumer (#3458) --- .../minecraftforge/client/model/pipeline/LightUtil.java | 9 +-------- .../client/model/pipeline/UnpackedBakedQuad.java | 9 +-------- .../client/model/pipeline/VertexTransformer.java | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java index e81d28e1ae..2b37fc378a 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java @@ -102,14 +102,7 @@ public class LightUtil public static void putBakedQuad(IVertexConsumer consumer, BakedQuad quad) { - try - { - consumer.setTexture(quad.getSprite()); - } - catch(AbstractMethodError e) - { - // catch missing method errors caused by change to IVertexConsumer - } + consumer.setTexture(quad.getSprite()); consumer.setQuadOrientation(quad.getFace()); if(quad.hasTintIndex()) { diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java index 475939d57d..dfd3a58fe7 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java @@ -66,14 +66,7 @@ public class UnpackedBakedQuad extends BakedQuad { consumer.setQuadTint(getTintIndex()); } - try - { - consumer.setTexture(sprite); - } - catch(AbstractMethodError e) - { - // catch missing method errors caused by change to IVertexConsumer - } + consumer.setTexture(sprite); consumer.setApplyDiffuseLighting(applyDiffuseLighting); consumer.setQuadOrientation(getFace()); for(int v = 0; v < 4; v++) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java index c549ebcb95..c585b952d1 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java @@ -44,14 +44,7 @@ public class VertexTransformer implements IVertexConsumer public void setTexture(TextureAtlasSprite texture) { - try - { - parent.setTexture(texture); - } - catch(AbstractMethodError e) - { - // catch missing method errors caused by change to IVertexConsumer - } + parent.setTexture(texture); } public void setQuadOrientation(EnumFacing orientation)