From e12d484db8921651932139360a3d8d52822aea47 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 20 Mar 2016 22:16:14 +0100 Subject: [PATCH] Texture for interface --- .../container/ContainerBase.java | 4 -- .../refinedstorage/proxy/ClientProxy.java | 1 + .../refinedstorage/blockstates/interface.json | 36 ++++++++++++++++++ .../textures/blocks/interface.png | Bin 0 -> 276 bytes 4 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/blockstates/interface.json create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/interface.png 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 0000000000000000000000000000000000000000..e347de0efa9f35d74da2ee6e1e5b6af322d781a9 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJGFhoz|!$QTl*6ePgDOF7xcu|LQ+;EaI44*j#X^ zcJ9XTM}PGmiA?d@dTxRT0-*AK{iThXsM5vA4fnvzrjKL{uz;|FB8l zXI{;t{*9`VQPZyOi#{P@eT+561ZQ+*nx QKnF2+y85}Sb4q9e0C<#MH~;_u literal 0 HcmV?d00001