upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

There's no Map.getOrDefault in java6.

Browse Source
This commit is contained in:
RainWarrior committed 2015-06-23 17:03:19 +03:00
1 parent 8f65678b99
commit 74501f509f
2 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/client/model/IPerspectiveState.java
+3 -1
View File
@@ -52,7 +52,9 @@ public interface IPerspectiveState extends IModelState
public IModelState forPerspective(TransformType type)
{
return states.getOrDefault(type, TRSRTransformation.identity());
IModelState state = states.get(type);
if(state == null) state = TRSRTransformation.identity();
return state;
}
}
}
src/main/java/net/minecraftforge/client/model/ItemLayerModel.java
+3 -2
View File
@@ -144,8 +144,9 @@ public class ItemLayerModel implements IRetexturableModel {
@Override
public Pair<IBakedModel, Matrix4f> handlePerspective(TransformType cameraTransformType)
{
TRSRTransformation tr = transforms.getOrDefault(cameraTransformType, TRSRTransformation.identity());
Matrix4f mat = tr == TRSRTransformation.identity() ? null : tr.getMatrix();
TRSRTransformation tr = transforms.get(cameraTransformType);
Matrix4f mat = null;
if(tr != null && tr != TRSRTransformation.identity()) mat = tr.getMatrix();
return Pair.of((IBakedModel)this, mat);
}
}