From 64e1282444281180902efd8a5b058227d457faac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 00:59:11 -0600 Subject: [PATCH] Done! --- .../botania/client/model/LexiconModel.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 209966c61..adc64729c 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -13,27 +13,27 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; import java.util.List; +@SuppressWarnings("deprecation") public class LexiconModel implements IPerspectiveAwareModel { + + private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); + @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) { + if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) return Pair.of(this, null); - } - - return Pair.of(new IFlexibleBakedModel.Wrapper(original, Attributes.DEFAULT_BAKED_FORMAT), new TRSRTransformation(original.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } - @Override public VertexFormat getFormat() { return DefaultVertexFormats.ITEM; } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } + @Override public List getFaceQuads(EnumFacing face) { return ImmutableList.of(); } @Override public List getGeneralQuads() { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; }