From 44c67796b86ad1686e7bf6679171b9e72b59bd63 Mon Sep 17 00:00:00 2001 From: Lignum Date: Mon, 29 May 2017 17:35:41 +0200 Subject: [PATCH] Fix generic-related compiler warning --- .../client/render/TurtleMultiModel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java index 938dbab9f..7120a047c 100644 --- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java +++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java @@ -14,7 +14,9 @@ import javax.vecmath.Matrix4f; import javax.vecmath.Point3f; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class TurtleMultiModel implements IBakedModel { @@ -25,7 +27,7 @@ public class TurtleMultiModel implements IBakedModel private IBakedModel m_rightUpgradeModel; private Matrix4f m_rightUpgradeTransform; private List m_generalQuads; - private List[] m_faceQuads; + private Map> m_faceQuads; public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, IBakedModel leftUpgradeModel, Matrix4f leftUpgradeTransform, IBakedModel rightUpgradeModel, Matrix4f rightUpgradeTransform ) { @@ -37,7 +39,7 @@ public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, IBaked m_rightUpgradeModel = rightUpgradeModel; m_rightUpgradeTransform = rightUpgradeTransform; m_generalQuads = null; - m_faceQuads = new List[6]; + m_faceQuads = new HashMap>(); } @Nonnull @@ -46,7 +48,7 @@ public List getQuads( IBlockState state, EnumFacing side, long rand ) { if( side != null ) { - if( m_faceQuads[ side.ordinal() ] == null ) + if( !m_faceQuads.containsKey( side ) ) { ArrayList quads = new ArrayList(); if( m_overlayModel != null ) @@ -62,9 +64,9 @@ public List getQuads( IBlockState state, EnumFacing side, long rand ) quads.addAll( transformQuads( m_rightUpgradeModel.getQuads( state, side, rand ), m_rightUpgradeTransform ) ); } quads.trimToSize(); - m_faceQuads[ side.ordinal() ] = quads; + m_faceQuads.put( side, quads ); } - return m_faceQuads[ side.ordinal() ]; + return m_faceQuads.get( side ); } else {