From 0d6087ca67775d0166a76e2664d190f70931db5d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Dec 2015 21:40:00 +0100 Subject: [PATCH] texture for machine casing --- .../java/storagecraft/block/BlockGrid.java | 2 +- .../java/storagecraft/proxy/ClientProxy.java | 6 ++-- .../assets/storagecraft/blockstates/grid.json | 1 - .../blockstates/machine_casing.json | 29 +++++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100755 src/main/resources/assets/storagecraft/blockstates/machine_casing.json diff --git a/src/main/java/storagecraft/block/BlockGrid.java b/src/main/java/storagecraft/block/BlockGrid.java index e617e1447..b45127d10 100755 --- a/src/main/java/storagecraft/block/BlockGrid.java +++ b/src/main/java/storagecraft/block/BlockGrid.java @@ -36,7 +36,7 @@ public class BlockGrid extends BlockMachine @Override public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { - for (int i = 0; i < 2; i++) + for (int i = 0; i <= 1; i++) { subItems.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index bbd8497bd..8f0172550 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -12,6 +12,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; +import storagecraft.block.EnumGridType; import storagecraft.item.ItemCore; import storagecraft.item.ItemProcessor; import storagecraft.item.ItemStorageCell; @@ -99,7 +100,8 @@ public class ClientProxy extends CommonProxy mesher.register(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "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), EnumGridType.NORMAL.getId(), new ModelResourceLocation("storagecraft:grid", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("storagecraft:grid", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.MACHINE_CASING), 0, new ModelResourceLocation("storagecraft:machine_casing", "inventory")); } } diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json index 348caaf50..4ac862475 100755 --- a/src/main/resources/assets/storagecraft/blockstates/grid.json +++ b/src/main/resources/assets/storagecraft/blockstates/grid.json @@ -2,7 +2,6 @@ "forge_marker": 1, "defaults": { "model": "orientable", - "transform": "forge:default-block", "textures": { "side": "storagecraft:blocks/side", "top": "storagecraft:blocks/side" diff --git a/src/main/resources/assets/storagecraft/blockstates/machine_casing.json b/src/main/resources/assets/storagecraft/blockstates/machine_casing.json new file mode 100755 index 000000000..cdbd97b41 --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/machine_casing.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "storagecraft:blocks/side" + } + }, + "variants": { + "inventory": [ + { + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } +} \ No newline at end of file