Fixed trapdoor rendering problems - they now render correctly both in…

… inventory (item model) and as a block (blockstate)
TerraFirmaCraft · Dec 12, 2018 · 9881e20 · 9881e20
1 parent 07e0142
commit 9881e20
Show file tree

Hide file tree

Showing 39 changed files with 64 additions and 40 deletions.
diff --git a/generateResources.py b/generateResources.py
@@ -13,6 +13,7 @@
 import time
 import zipfile
 
+
 def zipfolder(zip_name, target_dir):
     zipobj = zipfile.ZipFile(zip_name, 'w', zipfile.ZIP_DEFLATED)
     rootlen = len(target_dir) + 1
@@ -730,9 +731,10 @@ def item(filename_parts, *layers, parent='item/generated'):
     })
     cube_all(('slab', 'full', 'wood', wood_type), 'tfc:blocks/wood/planks/%s' % wood_type)
 
-    # TRAPDOORS
+    # (WOOD) TRAPDOORS
     blockstate(('wood', 'trapdoor', wood_type), None, textures={
             'texture': 'tfc:blocks/wood/trapdoor/%s' % wood_type,
+        'all': 'tfc:blocks/wood/trapdoor/%s' % wood_type,
         }, variants=TRAPDOOR_VARIANTS)
 
     # CHESTS
@@ -805,7 +807,10 @@ def item(filename_parts, *layers, parent='item/generated'):
 for wood_type in WOOD_TYPES:
     item(('wood', 'log', wood_type), 'tfc:items/wood/log/%s' % wood_type)
     item(('wood', 'door', wood_type), 'tfc:items/wood/door/%s' % wood_type)
-    item(('wood', 'trapdoor', wood_type), 'tfc:blocks/wood/trapdoor/%s' % wood_type, parent='block/trapdoor_bottom')
+
+    # Trapdoors are special - their item model needs to reference the blockstate #texture
+    model(('item', 'wood', 'trapdoor', wood_type), 'block/trapdoor_bottom',
+          {'texture': 'tfc:blocks/wood/trapdoor/%s' % wood_type})
 
 # GEMS
 for gem in GEM_TYPES:

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/acacia.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/acacia.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/acacia"
+      "texture": "tfc:blocks/wood/trapdoor/acacia",
+      "all": "tfc:blocks/wood/trapdoor/acacia"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/ash.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/ash.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/ash"
+      "texture": "tfc:blocks/wood/trapdoor/ash",
+      "all": "tfc:blocks/wood/trapdoor/ash"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/aspen.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/aspen.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/aspen"
+      "texture": "tfc:blocks/wood/trapdoor/aspen",
+      "all": "tfc:blocks/wood/trapdoor/aspen"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/birch.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/birch.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/birch"
+      "texture": "tfc:blocks/wood/trapdoor/birch",
+      "all": "tfc:blocks/wood/trapdoor/birch"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/blackwood.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/blackwood.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/blackwood"
+      "texture": "tfc:blocks/wood/trapdoor/blackwood",
+      "all": "tfc:blocks/wood/trapdoor/blackwood"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/chestnut.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/chestnut.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/chestnut"
+      "texture": "tfc:blocks/wood/trapdoor/chestnut",
+      "all": "tfc:blocks/wood/trapdoor/chestnut"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/douglas_fir.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/douglas_fir.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/douglas_fir"
+      "texture": "tfc:blocks/wood/trapdoor/douglas_fir",
+      "all": "tfc:blocks/wood/trapdoor/douglas_fir"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/hickory.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/hickory.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/hickory"
+      "texture": "tfc:blocks/wood/trapdoor/hickory",
+      "all": "tfc:blocks/wood/trapdoor/hickory"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/kapok.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/kapok.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/kapok"
+      "texture": "tfc:blocks/wood/trapdoor/kapok",
+      "all": "tfc:blocks/wood/trapdoor/kapok"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/maple.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/maple.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/maple"
+      "texture": "tfc:blocks/wood/trapdoor/maple",
+      "all": "tfc:blocks/wood/trapdoor/maple"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/oak.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/oak.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/oak"
+      "texture": "tfc:blocks/wood/trapdoor/oak",
+      "all": "tfc:blocks/wood/trapdoor/oak"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/palm.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/palm.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/palm"
+      "texture": "tfc:blocks/wood/trapdoor/palm",
+      "all": "tfc:blocks/wood/trapdoor/palm"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/pine.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/pine.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/pine"
+      "texture": "tfc:blocks/wood/trapdoor/pine",
+      "all": "tfc:blocks/wood/trapdoor/pine"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/rosewood.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/rosewood.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/rosewood"
+      "texture": "tfc:blocks/wood/trapdoor/rosewood",
+      "all": "tfc:blocks/wood/trapdoor/rosewood"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/sequoia.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/sequoia.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/sequoia"
+      "texture": "tfc:blocks/wood/trapdoor/sequoia",
+      "all": "tfc:blocks/wood/trapdoor/sequoia"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/spruce.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/spruce.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/spruce"
+      "texture": "tfc:blocks/wood/trapdoor/spruce",
+      "all": "tfc:blocks/wood/trapdoor/spruce"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/sycamore.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/sycamore.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/sycamore"
+      "texture": "tfc:blocks/wood/trapdoor/sycamore",
+      "all": "tfc:blocks/wood/trapdoor/sycamore"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/white_cedar.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/white_cedar.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/white_cedar"
+      "texture": "tfc:blocks/wood/trapdoor/white_cedar",
+      "all": "tfc:blocks/wood/trapdoor/white_cedar"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/blockstates/wood/trapdoor/willow.json b/src/main/resources/assets/tfc/blockstates/wood/trapdoor/willow.json
@@ -3,7 +3,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "texture": "tfc:blocks/wood/trapdoor/willow"
+      "texture": "tfc:blocks/wood/trapdoor/willow",
+      "all": "tfc:blocks/wood/trapdoor/willow"
     }
   },
   "variants": {

diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/acacia.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/acacia.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/acacia"
+    "texture": "tfc:blocks/wood/trapdoor/acacia"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/ash.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/ash.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/ash"
+    "texture": "tfc:blocks/wood/trapdoor/ash"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/aspen.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/aspen.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/aspen"
+    "texture": "tfc:blocks/wood/trapdoor/aspen"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/birch.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/birch.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/birch"
+    "texture": "tfc:blocks/wood/trapdoor/birch"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/blackwood.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/blackwood.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/blackwood"
+    "texture": "tfc:blocks/wood/trapdoor/blackwood"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/chestnut.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/chestnut.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/chestnut"
+    "texture": "tfc:blocks/wood/trapdoor/chestnut"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/douglas_fir.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/douglas_fir.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/douglas_fir"
+    "texture": "tfc:blocks/wood/trapdoor/douglas_fir"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/hickory.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/hickory.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/hickory"
+    "texture": "tfc:blocks/wood/trapdoor/hickory"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/kapok.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/kapok.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/kapok"
+    "texture": "tfc:blocks/wood/trapdoor/kapok"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/maple.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/maple.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/maple"
+    "texture": "tfc:blocks/wood/trapdoor/maple"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/oak.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/oak.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/oak"
+    "texture": "tfc:blocks/wood/trapdoor/oak"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/palm.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/palm.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/palm"
+    "texture": "tfc:blocks/wood/trapdoor/palm"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/pine.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/pine.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/pine"
+    "texture": "tfc:blocks/wood/trapdoor/pine"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/rosewood.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/rosewood.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/rosewood"
+    "texture": "tfc:blocks/wood/trapdoor/rosewood"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/sequoia.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/sequoia.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/sequoia"
+    "texture": "tfc:blocks/wood/trapdoor/sequoia"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/spruce.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/spruce.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/spruce"
+    "texture": "tfc:blocks/wood/trapdoor/spruce"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/sycamore.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/sycamore.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/sycamore"
+    "texture": "tfc:blocks/wood/trapdoor/sycamore"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/white_cedar.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/white_cedar.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/white_cedar"
+    "texture": "tfc:blocks/wood/trapdoor/white_cedar"
   }
 }
diff --git a/src/main/resources/assets/tfc/models/item/wood/trapdoor/willow.json b/src/main/resources/assets/tfc/models/item/wood/trapdoor/willow.json
@@ -2,6 +2,6 @@
   "__comment": "Generated by generateResources.py function: model",
   "parent": "block/trapdoor_bottom",
   "textures": {
-    "layer0": "tfc:blocks/wood/trapdoor/willow"
+    "texture": "tfc:blocks/wood/trapdoor/willow"
   }
 }