diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java index 896aa5cf4..19b8349d9 100644 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -63,10 +63,6 @@ public abstract class ContainerBase extends Container if (slot instanceof SlotSpecimen) { - // @TODO: Put whole the stack if left click - // @TODO: Put one item from stack if right click - // @TODO: If item is already there, on left / right click add 1 or remove 1 - // @TODO: If click with empty stack, empty it out if (clickedButton == 2 || player.inventory.getItemStack() == null) { slot.putStack(null); diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 50ea4d229..39eb1f533 100644 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -119,6 +119,7 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json new file mode 100644 index 000000000..212f79249 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/interface" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + }, + "connected": { + "true": { + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png new file mode 100644 index 000000000..e347de0ef Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png differ