From 995600bd16941e196a90782e644eedbe5eebeeb2 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Dec 2015 21:03:45 +0100 Subject: [PATCH] make grid render in inventory --- .../java/storagecraft/proxy/ClientProxy.java | 5 ++-- .../java/storagecraft/proxy/CommonProxy.java | 2 +- .../assets/storagecraft/blockstates/grid.json | 26 +++++++++++-------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index cade282cc..bbd8497bd 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -98,9 +98,8 @@ public class ClientProxy extends CommonProxy mesher.register(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory")); // Blocks - //mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory")); - //mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 1, new ModelResourceLocation("storagecraft:grid", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 1, new ModelResourceLocation("storagecraft:grid", "inventory")); } } diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java index 3ad8f52f4..f188c95fb 100755 --- a/src/main/java/storagecraft/proxy/CommonProxy.java +++ b/src/main/java/storagecraft/proxy/CommonProxy.java @@ -95,7 +95,7 @@ public class CommonProxy GameRegistry.registerItem(StorageCraftItems.STORAGE_CELL, "storageCell"); GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID, "wirelessGrid"); GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID_PLATE, "wirelessGridPlate"); - GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "storigiumIngot"); + GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "quartzEnrichedIron"); GameRegistry.registerItem(StorageCraftItems.CORE, "core"); GameRegistry.registerItem(StorageCraftItems.SILICON, "silicon"); GameRegistry.registerItem(StorageCraftItems.PROCESSOR, "processor"); diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json index 22013c460..348caaf50 100755 --- a/src/main/resources/assets/storagecraft/blockstates/grid.json +++ b/src/main/resources/assets/storagecraft/blockstates/grid.json @@ -9,6 +9,20 @@ } }, "variants": { + "inventory": [ + { + "textures": { + "front": "storagecraft:blocks/grid_disconnected" + }, + "y": 0 + }, + { + "textures": { + "front": "storagecraft:blocks/grid_disconnected" + }, + "y": 0 + } + ], "type": { "normal": { }, @@ -47,15 +61,5 @@ "x": 90 } } - }, - "inventory": [ - { - "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/grid_disconnected" - }, - "y": 270 - } - ] + } } \ No newline at end of file