From fe7edeef896bbaef2c70f04b90bf6f99d50d341b Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Jul 2024 12:34:38 -0400 Subject: [PATCH] Implement texture handling for BlockItemBuilder texture overrides --- .../dev/latvian/mods/kubejs/block/BlockBuilder.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java b/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java index 8228be755..18ae2fce0 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java @@ -218,11 +218,17 @@ public void generateAssetJsons(AssetJsonGenerator generator) { } protected void generateItemModelJson(ModelGenerator m) { - if (!model.isEmpty()) { - m.parent(model); + if (itemBuilder.textureJson.size() != 0) { + m.parent("minecraft:item/generated"); } else { - m.parent(newID("block/", "").toString()); + if (!model.isEmpty()) { + m.parent(model); + } else { + m.parent(newID("block/", "").toString()); + } + itemBuilder.texture(newID("item/", "").toString()); } + m.textures(itemBuilder.textureJson); } protected void generateBlockModelJsons(AssetJsonGenerator generator) {