Fix orientations for Portable Grid, v2 (#1675)

* Remove BakedModelPortableGrid, and add proper camera transforms

* Add the correct on-ground transform, and tweak item frame scale

* Switch to hold Portable Grid more like a laptop

src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java

@@ -313,8 +313,6 @@ public class ProxyClient extends ProxyCommon {
             if (model.getResourceDomain().equals(RS.ID)) {
                 if (model.getResourcePath().equals("pattern")) {
                     e.getModelRegistry().putObject(model, new BakedModelPattern(e.getModelRegistry().getObject(model)));
-                } else if (model.getResourcePath().equals("portable_grid")) {
-                    e.getModelRegistry().putObject(model, new BakedModelPortableGrid(e.getModelRegistry().getObject(model)));
                 }
             }
         }

src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java

@@ -1,67 +0,0 @@
-package com.raoulvdberge.refinedstorage.render;
-
-import com.raoulvdberge.refinedstorage.util.RenderUtils;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.block.model.ItemOverrideList;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.model.TRSRTransformation;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.annotation.Nullable;
-import javax.vecmath.Matrix4f;
-import java.util.List;
-
-public class BakedModelPortableGrid implements IBakedModel {
-    private IBakedModel base;
-
-    public BakedModelPortableGrid(IBakedModel base) {
-        this.base = base;
-    }
-
-    @Override
-    public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
-        TRSRTransformation transform = RenderUtils.getDefaultBlockTransforms().get(cameraTransformType);
-
-        return Pair.of(this, transform == null ? RenderUtils.EMPTY_MATRIX_TRANSFORM : transform.getMatrix());
-    }
-
-    @Override
-    public List<BakedQuad> getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) {
-        return base.getQuads(state, side, rand);
-    }
-
-    @Override
-    public boolean isAmbientOcclusion() {
-        return base.isAmbientOcclusion();
-    }
-
-    @Override
-    public boolean isGui3d() {
-        return base.isGui3d();
-    }
-
-    @Override
-    public boolean isBuiltInRenderer() {
-        return base.isBuiltInRenderer();
-    }
-
-    @Override
-    public TextureAtlasSprite getParticleTexture() {
-        return base.getParticleTexture();
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public ItemCameraTransforms getItemCameraTransforms() {
-        return base.getItemCameraTransforms();
-    }
-
-    @Override
-    public ItemOverrideList getOverrides() {
-        return base.getOverrides();
-    }
-}

src/main/resources/assets/refinedstorage/models/block/portable_grid.json

@@ -1,4 +1,37 @@
 {
+  "display": {
+    "firstperson_lefthand": {
+      "rotation": [10, 130, 0],
+      "scale": [0.4, 0.4, 0.4],
+      "translation": [2, 3.5, 0]
+    },
+    "firstperson_righthand": {
+      "rotation": [10, 130, 0],
+      "scale": [0.4, 0.4, 0.4],
+      "translation": [2, 3.5, 0]
+    },
+    "thirdperson_lefthand": {
+      "rotation": [10, 180, 0],
+      "scale": [0.4, 0.4, 0.4],
+      "translation": [0, 3, 1]
+    },
+    "thirdperson_righthand": {
+      "rotation": [10, 180, 0],
+      "scale": [0.4, 0.4, 0.4],
+      "translation": [0, 3, 1]
+    },
+    "gui": {
+      "rotation": [30, 225, 0],
+      "scale": [0.625, 0.625, 0.625]
+    },
+    "ground": {
+      "translation": [0, 3, 0],
+      "scale": [0.25, 0.25, 0.25]
+    },
+    "fixed": {
+      "scale": [0.75, 0.75, 0.75]
+    }
+  },
   "elements": [
     {
       "name": "cube",