From 83a2a2e852e41199ee870373bbf080beda218061 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 24 Dec 2018 11:47:50 -0500 Subject: [PATCH] Multipart item models --- .../client/MultipartModelProvider.java | 3 ++ .../models/multipart/multipart.json | 34 +++++++++++++++++++ .../models/multipart/bottom.json | 1 + .../models/multipart/vertical.json | 1 + .../multipartstates/test_part.json | 3 +- 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/simplemultipart/models/multipart/multipart.json diff --git a/src/main/java/net/shadowfacts/simplemultipart/client/MultipartModelProvider.java b/src/main/java/net/shadowfacts/simplemultipart/client/MultipartModelProvider.java index 1812a3b..3e365d6 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/client/MultipartModelProvider.java +++ b/src/main/java/net/shadowfacts/simplemultipart/client/MultipartModelProvider.java @@ -43,6 +43,9 @@ public class MultipartModelProvider implements ModelProvider { multipartModels.add(id); adder.accept(id); } + + // TODO: should multiparts be able to control this? + multipartModels.add(new ModelIdentifier(partId, "inventory")); } } diff --git a/src/main/resources/assets/simplemultipart/models/multipart/multipart.json b/src/main/resources/assets/simplemultipart/models/multipart/multipart.json new file mode 100644 index 0000000..ae3669d --- /dev/null +++ b/src/main/resources/assets/simplemultipart/models/multipart/multipart.json @@ -0,0 +1,34 @@ +{ + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } +} diff --git a/src/test/resources/assets/multipart_test/models/multipart/bottom.json b/src/test/resources/assets/multipart_test/models/multipart/bottom.json index d2beea9..2eb48da 100644 --- a/src/test/resources/assets/multipart_test/models/multipart/bottom.json +++ b/src/test/resources/assets/multipart_test/models/multipart/bottom.json @@ -1,4 +1,5 @@ { + "parent": "simplemultipart:multipart/multipart", "textures": { "texture": "block/iron_block" }, diff --git a/src/test/resources/assets/multipart_test/models/multipart/vertical.json b/src/test/resources/assets/multipart_test/models/multipart/vertical.json index 21c3a10..b3033a3 100644 --- a/src/test/resources/assets/multipart_test/models/multipart/vertical.json +++ b/src/test/resources/assets/multipart_test/models/multipart/vertical.json @@ -1,4 +1,5 @@ { + "parent": "simplemultipart:multipart/multipart", "textures": { "texture": "block/gold_block" }, diff --git a/src/test/resources/assets/multipart_test/multipartstates/test_part.json b/src/test/resources/assets/multipart_test/multipartstates/test_part.json index 114bf38..fd214d0 100644 --- a/src/test/resources/assets/multipart_test/multipartstates/test_part.json +++ b/src/test/resources/assets/multipart_test/multipartstates/test_part.json @@ -5,6 +5,7 @@ "slot=north": { "model": "multipart_test:multipart/vertical" }, "slot=south": { "model": "multipart_test:multipart/vertical", "y": 180 }, "slot=east": { "model": "multipart_test:multipart/vertical", "y": 90 }, - "slot=west": { "model": "multipart_test:multipart/vertical", "y": 270 } + "slot=west": { "model": "multipart_test:multipart/vertical", "y": 270 }, + "inventory": { "model": "multipart_test:multipart/vertical", "y": 180 } } } \ No newline at end of file