From 4e6ad80370fd9d165da34a155278cae5a7b9b573 Mon Sep 17 00:00:00 2001
From: RainWarrior <rainwarrior@fry.su>
Date: Mon, 21 Mar 2016 18:23:27 +0300
Subject: [PATCH] Removed blockCenterToCorner from TRSRTransformation
 constructor. Closes #2461.

---
 .../net/minecraftforge/client/ForgeHooksClient.java    |  2 +-
 .../client/model/IPerspectiveAwareModel.java           |  2 +-
 .../common/model/TRSRTransformation.java               | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
index 6e6f59c59..45ef4d46c 100644
--- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -597,7 +597,7 @@ public class ForgeHooksClient
     public static Optional<TRSRTransformation> applyTransform(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform, Optional<? extends IModelPart> part)
     {
         if(part.isPresent()) return Optional.absent();
-        return Optional.of(new TRSRTransformation(transform));
+        return Optional.of(TRSRTransformation.blockCenterToCorner(new TRSRTransformation(transform)));
     }
 
     public static Optional<TRSRTransformation> applyTransform(Matrix4f matrix, Optional<? extends IModelPart> part)
diff --git a/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java b/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java
index 2c529f9b8..fae295981 100644
--- a/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java
+++ b/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java
@@ -68,7 +68,7 @@ public interface IPerspectiveAwareModel extends IBakedModel
             ImmutableMap.Builder<TransformType, TRSRTransformation> builder = ImmutableMap.builder();
             for(TransformType type : TransformType.values())
             {
-                builder.put(type, new TRSRTransformation(transforms.getTransform(type)));
+                builder.put(type, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(transforms.getTransform(type))));
             }
             return builder.build();
         }
diff --git a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
index 91ddf6c05..77ecb6225 100644
--- a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
+++ b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
@@ -73,15 +73,7 @@ public final class TRSRTransformation implements IModelState, ITransformation
     @SideOnly(Side.CLIENT)
     public TRSRTransformation(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform)
     {
-        this(getMatrix(transform));
-    }
-
-    @Deprecated
-    @SideOnly(Side.CLIENT)
-    public static Matrix4f getMatrix(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform)
-    {
-        TRSRTransformation ret = new TRSRTransformation(toVecmath(transform.translation), quatFromXYZDegrees(toVecmath(transform.rotation)), toVecmath(transform.scale), null);
-        return blockCenterToCorner(ret).getMatrix();
+        this(toVecmath(transform.translation), quatFromXYZDegrees(toVecmath(transform.rotation)), toVecmath(transform.scale), null);
     }
 
     @SideOnly(Side.CLIENT)