diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index a11e68a68..c7f7af9e2 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -110,5 +110,8 @@ public class ClientProxy extends CommonProxy mesher.register(Item.getItemFromBlock(StorageCraftBlocks.DRIVE), 0, new ModelResourceLocation("storagecraft:drive", "inventory")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("storagecraft:controller", "inventory")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("storagecraft:controller", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("storagecraft:constructor", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.DESTRUCTOR), 0, new ModelResourceLocation("storagecraft:destructor", "inventory")); + mesher.register(Item.getItemFromBlock(StorageCraftBlocks.SOLDERER), 0, new ModelResourceLocation("storagecraft:solderer", "inventory")); } } diff --git a/src/main/resources/assets/storagecraft/blockstates/constructor.json b/src/main/resources/assets/storagecraft/blockstates/constructor.json new file mode 100755 index 000000000..97fef7a1a --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/constructor.json @@ -0,0 +1,52 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "storagecraft:blocks/side", + "top": "storagecraft:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "textures": { + "front": "storagecraft:blocks/constructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "storagecraft:blocks/constructor_connected" + } + }, + "false": { + "textures": { + "front": "storagecraft:blocks/constructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/blockstates/destructor.json b/src/main/resources/assets/storagecraft/blockstates/destructor.json new file mode 100755 index 000000000..2a02785cc --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/destructor.json @@ -0,0 +1,52 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "storagecraft:blocks/side", + "top": "storagecraft:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "textures": { + "front": "storagecraft:blocks/destructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "storagecraft:blocks/destructor_connected" + } + }, + "false": { + "textures": { + "front": "storagecraft:blocks/destructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/blockstates/solderer.json b/src/main/resources/assets/storagecraft/blockstates/solderer.json new file mode 100755 index 000000000..9d0e26606 --- /dev/null +++ b/src/main/resources/assets/storagecraft/blockstates/solderer.json @@ -0,0 +1,52 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "storagecraft:blocks/side", + "top": "storagecraft:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "textures": { + "front": "storagecraft:blocks/solderer_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "storagecraft:blocks/solderer_connected" + } + }, + "false": { + "textures": { + "front": "storagecraft:blocks/solderer_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/textures/blocks/constructorConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/constructor_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/constructorConnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/constructor_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/constructorDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/constructor_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/constructorDisconnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/constructor_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/destructorConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/destructor_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/destructorConnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/destructor_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/destructorDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/destructor_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/destructorDisconnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/destructor_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/soldererConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/solderer_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/soldererConnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/solderer_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/soldererDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/solderer_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/soldererDisconnected.png rename to src/main/resources/assets/storagecraft/textures/blocks/solderer_disconnected.png