Merge pull request #6 from NOYBss/2020.4

Custom Block Item Support
MCreator · Jul 29, 2020 · fa8e382 · fa8e382
2 parents 291d737 + b00387c
commit fa8e382
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/forge-1.12.2/templates/json/block_item.json.ftl b/forge-1.12.2/templates/json/block_item.json.ftl
@@ -1,3 +1,12 @@
+<#-- @formatter:off -->
+<#if data.itemTexture?has_content>
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "${modid}:items/${data.itemTexture}"
+  }
+}
+<#else>
 {
     "parent": "${modid}:block/${registryname}",
     "display": {
@@ -19,4 +28,6 @@
         ]
       }
     }
-}
+}
+</#if>
+<#-- @formatter:on -->
diff --git a/forge-1.12.2/templates/json/block_item_cmodel.json.ftl b/forge-1.12.2/templates/json/block_item_cmodel.json.ftl
@@ -1,6 +1,12 @@
+<#-- @formatter:off -->
 {
     "parent": "item/handheld",
     "textures": {
-"layer0": "${modid}:blocks/${data.texture}"
+        <#if data.itemTexture?has_content>
+        "layer0": "${modid}:items/${data.itemTexture}"
+        <#else>
+        "layer0": "${modid}:blocks/${data.texture}"
+        </#if>
     }
-}
+}
+<#-- @formatter:on -->