Fix some model stuff

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Solderer now accepts items from any side, allowing easier automation (raoulvdberge)
 - Solderer is now intelligent about items in slots, and will only accept an item if it is part of a recipe (raoulvdberge)
 - Changed recipe for upgrades in the Solderer, they now just take 1 of the unique item instead of 2, using redstone instead (raoulvdberge)
+- Fixed blocks in hand facing wrong direction (raoulvdberge)
 - Updated to Forge 2088 (raoulvdberge)
 
 ### 1.0.2

src/main/java/refinedstorage/item/ItemBlockController.java

@@ -20,21 +20,16 @@ public class ItemBlockController extends ItemBlockBase {
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         if (stack.getMetadata() != EnumControllerType.CREATIVE.getId()) {
-            int energyStored = 0;
+            tooltip.add(I18n.format("misc.refinedstorage:energy_stored", getEnergyStored(stack), getEnergyCapacity(stack)));
-            int energyCapacity = RefinedStorage.INSTANCE.controllerCapacity;
-
-            if (stack.getTagCompound() != null) {
-                if (stack.getTagCompound().hasKey(TileController.NBT_ENERGY)) {
-                    energyStored = stack.getTagCompound().getInteger(TileController.NBT_ENERGY);
-                }
-
-                if (stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) {
-                    energyCapacity = stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY);
         }
     }
 
-            tooltip.add(I18n.format("misc.refinedstorage:energy_stored", energyStored, energyCapacity));
+    public static int getEnergyStored(ItemStack stack) {
+        return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY) : 0;
     }
+
+    public static int getEnergyCapacity(ItemStack stack) {
+        return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.controllerCapacity;
     }
 
     @Override

src/main/java/refinedstorage/proxy/ClientProxy.java

@@ -9,6 +9,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -28,6 +29,7 @@ import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.block.*;
 import refinedstorage.item.*;
+import refinedstorage.tile.TileController;
 
 import java.util.List;
 
@@ -246,17 +248,15 @@ public class ClientProxy extends CommonProxy {
 
         // Blocks
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=normal"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=crafting"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=pattern"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:fluid_grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=fluid"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DISK_DRIVE), 0, new ModelResourceLocation("refinedstorage:disk_drive", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:creative_controller", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
@@ -281,5 +281,13 @@ public class ClientProxy extends CommonProxy {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
+
+        ModelLoader.setCustomStateMapper(RefinedStorageBlocks.CONTROLLER, new StateMap.Builder().ignore(BlockController.TYPE).build());
+
+        ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), stack -> {
+            int energy = stack.getItemDamage() == EnumControllerType.CREATIVE.getId() ? 7 : TileController.getEnergyScaled(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack), 7);
+
+            return new ModelResourceLocation("refinedstorage:controller", "direction=north,energy=" + energy);
+        });
     }
 }

src/main/resources/assets/refinedstorage/blockstates/controller.json

@@ -9,12 +9,6 @@
     }
   },
   "variants": {
-    "inventory": [
-      {
-        "y": 0,
-        "transform": "forge:default-block"
-      }
-    ],
     "energy": {
       "0": {
         "textures": {
@@ -57,12 +51,6 @@
         }
       }
     },
-    "type": {
-      "normal": {
-      },
-      "creative": {
-      }
-    },
     "direction": {
       "north": {
         "y": 0

src/main/resources/assets/refinedstorage/blockstates/crafter.json

@@ -13,7 +13,6 @@
         "textures": {
           "front": "refinedstorage:blocks/crafter_disconnected"
         },
-        "transform": "forge:default-block",
         "y": 0
       }
     ],

src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json

@@ -11,7 +11,6 @@
   "variants": {
     "inventory": [
       {
-        "transform": "forge:default-block",
         "y": 0
       }
     ],

src/main/resources/assets/refinedstorage/blockstates/creative_controller.json

@@ -1,63 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "model": "orientable",
-    "textures": {
-      "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/side",
-      "front": "refinedstorage:blocks/controller_7"
-    }
-  },
-  "variants": {
-    "inventory": [
-      {
-        "y": 0,
-        "transform": "forge:default-block"
-      }
-    ],
-    "energy": {
-      "0": {
-      },
-      "1": {
-      },
-      "2": {
-      },
-      "3": {
-      },
-      "4": {
-      },
-      "5": {
-      },
-      "6": {
-      },
-      "7": {
-      }
-    },
-    "type": {
-      "normal": {
-      },
-      "creative": {
-      }
-    },
-    "direction": {
-      "north": {
-        "y": 0
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      },
-      "up": {
-        "x": 270
-      },
-      "down": {
-        "x": 90
-      }
-    }
-  }
-}

src/main/resources/assets/refinedstorage/blockstates/disk_drive.json

@@ -11,7 +11,6 @@
   "variants": {
     "inventory": [
       {
-        "transform": "forge:default-block",
         "y": 0
       }
     ],

src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json

@@ -11,7 +11,6 @@
   "variants": {
     "inventory": [
       {
-        "transform": "forge:default-block",
         "y": 0
       }
     ],

src/main/resources/assets/refinedstorage/blockstates/fluid_grid.json

@@ -1,58 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "model": "orientable",
-    "textures": {
-      "side": "refinedstorage:blocks/fluid_grid_side",
-      "top": "refinedstorage:blocks/fluid_grid_side",
-      "front": "refinedstorage:blocks/fluid_grid_disconnected"
-    }
-  },
-  "variants": {
-    "inventory": [
-      {
-        "transform": "forge:default-block",
-        "y": 0
-      }
-    ],
-    "connected": {
-      "true": {
-        "textures": {
-          "front": "refinedstorage:blocks/fluid_grid_connected"
-        }
-      },
-      "false": {
-      }
-    },
-    "type": {
-      "normal": {
-      },
-      "crafting": {
-      },
-      "pattern": {
-      },
-      "fluid": {
-      }
-    },
-    "direction": {
-      "north": {
-        "y": 0
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      },
-      "up": {
-        "x": 270
-      },
-      "down": {
-        "x": 90
-      }
-    }
-  }
-}

src/main/resources/assets/refinedstorage/blockstates/grid.json

@@ -9,12 +9,6 @@
     }
   },
   "variants": {
-    "inventory": [
-      {
-        "transform": "forge:default-block",
-        "y": 0
-      }
-    ],
     "connected": {
       "true": {
         "textures": {

src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json

@@ -15,8 +15,7 @@
   "variants": {
     "inventory": [
       {
-        "transform": "forge:default-block",
+        "transform": "forge:default-block"
-        "y": 0
       }
     ],
     "normal": {