From 12cba7f61157ac8ab1260118643ca25ec63ead8c Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 25 Mar 2020 15:16:14 +0100 Subject: [PATCH] Fix extractor model a bit --- .../extractor/ExtractorAttachmentType.java | 1 - .../block/pipe/attachment/attachment.json | 243 +++++++++++++++++- 2 files changed, 241 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedpipes/network/pipe/attachment/extractor/ExtractorAttachmentType.java b/src/main/java/com/raoulvdberge/refinedpipes/network/pipe/attachment/extractor/ExtractorAttachmentType.java index b3f2a6c..837e29c 100644 --- a/src/main/java/com/raoulvdberge/refinedpipes/network/pipe/attachment/extractor/ExtractorAttachmentType.java +++ b/src/main/java/com/raoulvdberge/refinedpipes/network/pipe/attachment/extractor/ExtractorAttachmentType.java @@ -90,7 +90,6 @@ private void update(Network network, ItemPipe pipe, Attachment attachment, Block return; } - // TODO: extend attachment model by one ItemStack extractedActual = source.extractItem(firstSlot, type.itemsToExtract, false); if (extractedActual.isEmpty()) { return; diff --git a/src/main/resources/assets/refinedpipes/models/block/pipe/attachment/attachment.json b/src/main/resources/assets/refinedpipes/models/block/pipe/attachment/attachment.json index 7630f0b..0fbb4d2 100644 --- a/src/main/resources/assets/refinedpipes/models/block/pipe/attachment/attachment.json +++ b/src/main/resources/assets/refinedpipes/models/block/pipe/attachment/attachment.json @@ -1,17 +1,20 @@ { "parent": "block/block", + "textures": { + "1": "refinedpipes:blocks/simple_item_pipe" + }, "elements": [ { "name": "Attachment", "from": [ 3, 3, - 1 + 0 ], "to": [ 13, 13, - 4 + 3 ], "faces": { "north": { @@ -69,6 +72,242 @@ "texture": "#attachment" } } + }, + { + "from": [ + 4, + 11, + 3 + ], + "to": [ + 5, + 12, + 4 + ], + "faces": { + "east": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + } + } + }, + { + "from": [ + 11, + 11, + 3 + ], + "to": [ + 12, + 12, + 4 + ], + "faces": { + "east": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + } + } + }, + { + "from": [ + 11, + 4, + 3 + ], + "to": [ + 12, + 5, + 4 + ], + "faces": { + "east": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + } + } + }, + { + "from": [ + 4, + 4, + 3 + ], + "to": [ + 5, + 5, + 4 + ], + "faces": { + "east": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 0, + 4, + 1, + 5 + ], + "texture": "#1" + } + } } ] } \ No newline at end of file