diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index 88781f277..c9e6aceb7 100644 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -68,6 +68,7 @@ public class ClientProxy extends CommonProxy ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); + // Items mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("storagecraft:1k_storage_cell", "inventory")); mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("storagecraft:4k_storage_cell", "inventory")); mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("storagecraft:16k_storage_cell", "inventory")); @@ -95,5 +96,9 @@ public class ClientProxy extends CommonProxy mesher.register(StorageCraftItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("storagecraft:destruction_core", "inventory")); 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")); } } diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json new file mode 100644 index 000000000..b494681e5 --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/grid.json @@ -0,0 +1,100 @@ +{ + "variants": { + "connected=true,direction=north,type=normal": { + "model": "storagecraft:grid_connected", + "y": 0 + }, + "connected=true,direction=north,type=crafting": { + "model": "storagecraft:grid_connected", + "y": 0 + }, + "connected=false,direction=north,type=normal": { + "model": "storagecraft:grid_disconnected", + "y": 0 + }, + "connected=false,direction=north,type=crafting": { + "model": "storagecraft:grid_disconnected", + "y": 0 + }, + "connected=true,direction=east,type=normal": { + "model": "storagecraft:grid_connected", + "y": 90 + }, + "connected=true,direction=east,type=crafting": { + "model": "storagecraft:grid_connected", + "y": 90 + }, + "connected=false,direction=east,type=normal": { + "model": "storagecraft:grid_disconnected", + "y": 90 + }, + "connected=false,direction=east,type=crafting": { + "model": "storagecraft:grid_disconnected", + "y": 90 + }, + "connected=true,direction=south,type=normal": { + "model": "storagecraft:grid_connected", + "y": 180 + }, + "connected=true,direction=south,type=crafting": { + "model": "storagecraft:grid_connected", + "y": 180 + }, + "connected=false,direction=south,type=normal": { + "model": "storagecraft:grid_disconnected", + "y": 180 + }, + "connected=false,direction=south,type=crafting": { + "model": "storagecraft:grid_disconnected", + "y": 180 + }, + "connected=true,direction=west,type=normal": { + "model": "storagecraft:grid_connected", + "y": 270 + }, + "connected=true,direction=west,type=crafting": { + "model": "storagecraft:grid_connected", + "y": 270 + }, + "connected=false,direction=west,type=normal": { + "model": "storagecraft:grid_disconnected", + "y": 270 + }, + "connected=false,direction=west,type=crafting": { + "model": "storagecraft:grid_disconnected", + "y": 270 + }, + "connected=true,direction=up,type=normal": { + "model": "storagecraft:grid_connected", + "x": 270 + }, + "connected=true,direction=up,type=crafting": { + "model": "storagecraft:grid_connected", + "x": 270 + }, + "connected=false,direction=up,type=normal": { + "model": "storagecraft:grid_disconnected", + "x": 270 + }, + "connected=false,direction=up,type=crafting": { + "model": "storagecraft:grid_disconnected", + "x": 270 + }, + "connected=true,direction=down,type=normal": { + "model": "storagecraft:grid_connected", + "x": 90 + }, + "connected=true,direction=down,type=crafting": { + "model": "storagecraft:grid_connected", + "x": 90 + }, + "connected=false,direction=down,type=normal": { + "model": "storagecraft:grid_disconnected", + "x": 90 + }, + "connected=false,direction=down,type=crafting": { + "model": "storagecraft:grid_disconnected", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/models/block/grid_connected.json b/src/main/resources/assets/storagecraft/models/block/grid_connected.json new file mode 100644 index 000000000..15134560b --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/block/grid_connected.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "storagecraft:blocks/side", + "front": "storagecraft:blocks/grid_connected", + "side": "storagecraft:blocks/side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json b/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json new file mode 100644 index 000000000..d7b860f58 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "storagecraft:blocks/side", + "front": "storagecraft:blocks/grid_disconnected", + "side": "storagecraft:blocks/side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/models/item/grid.json b/src/main/resources/assets/storagecraft/models/item/grid.json new file mode 100644 index 000000000..7677c6311 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/grid.json @@ -0,0 +1,11 @@ +{ + "parent": "storagecraft:block/grid_disconnected", + "display": { + "thirdperson": { + "rotation": [10, -45, 170], + "translation": [0, 1.5, -2.75], + "scale": [0.375, 0.375, 0.375] + } + } +} + diff --git a/src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/grid_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/grid_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/grid_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/grid_disconnected.png