From 7da41b02c95b61873fff8fd13f45712eb545c7aa Mon Sep 17 00:00:00 2001
From: Valery-a <83373303+Valery-a@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:00:58 +0300
Subject: [PATCH] fix: fixed zombies and husks not having texture (#203)

---
 prismarine-viewer/viewer/lib/entities.ts      |   3 +-
 .../viewer/lib/entity/EntityMesh.js           |  10 +
 .../viewer/lib/entity/exportedModels.js       |   1 +
 .../viewer/lib/entity/models/zombie.obj       | 472 +++++++++---------
 4 files changed, 248 insertions(+), 238 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 281a442e..ee659263 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -340,9 +340,8 @@ export class Entities extends EventEmitter {
   }
 
   update (entity: import('prismarine-entity').Entity & { delete?; pos }, overrides) {
-    let isPlayerModel = entity.name === 'player'
+    const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie' || entity.name === 'zombie_villager' || entity.name === 'husk') {
-      isPlayerModel = true
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
     }
     if (!this.entities[entity.id] && !entity.delete) {
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
index 39b2d62d..1387d2cc 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
@@ -1,6 +1,7 @@
 //@ts-check
 import * as THREE from 'three'
 import { OBJLoader } from 'three-stdlib'
+import huskPng from 'mc-assets/dist/other-textures/latest/entity/zombie/husk.png'
 import entities from './entities.json'
 import { externalModels } from './objModels'
 import externalTexturesJson from './externalTextures.json'
@@ -290,6 +291,10 @@ const getEntity = (name) => {
 //   zombie_villager: 'zombie_villager/zombie_villager'
 // }
 
+const scaleEntity = {
+  zombie: 1.9,
+  husk: 1.9
+}
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class EntityMesh {
   constructor(version, type, scene, /** @type {{textures?, rotation?: Record<string, {x,y,z}>}} */overrides = {}) {
@@ -303,6 +308,9 @@ export class EntityMesh {
       if (originalType === 'zombie_horse') {
         texturePath = `textures/${version}/entity/horse/horse_zombie.png`
       }
+      if (originalType === 'husk') {
+        texturePath = huskPng
+      }
       if (originalType === 'skeleton_horse') {
         texturePath = `textures/${version}/entity/horse/horse_skeleton.png`
       }
@@ -325,6 +333,8 @@ export class EntityMesh {
         alphaTest: 0.1
       })
       const obj = objLoader.parse(externalModels[type])
+      const scale = scaleEntity[originalType]
+      if (scale) obj.scale.set(scale, scale, scale)
       if (type === 'boat') obj.position.y = -1 // todo, should not be hardcoded
       obj.traverse((child) => {
         if (child instanceof THREE.Mesh) {
diff --git a/prismarine-viewer/viewer/lib/entity/exportedModels.js b/prismarine-viewer/viewer/lib/entity/exportedModels.js
index b43658ec..53d55d5e 100644
--- a/prismarine-viewer/viewer/lib/entity/exportedModels.js
+++ b/prismarine-viewer/viewer/lib/entity/exportedModels.js
@@ -35,4 +35,5 @@ export { default as witch } from './models/witch.obj'
 export { default as wolf } from './models/wolf.obj'
 export { default as zombie_villager } from './models/zombie_villager.obj'
 export { default as zombie } from './models/zombie.obj'
+export { default as husk } from './models/zombie.obj'
 export { default as boat } from './models/boat.obj'
diff --git a/prismarine-viewer/viewer/lib/entity/models/zombie.obj b/prismarine-viewer/viewer/lib/entity/models/zombie.obj
index bcd7444c..42f1e722 100644
--- a/prismarine-viewer/viewer/lib/entity/models/zombie.obj
+++ b/prismarine-viewer/viewer/lib/entity/models/zombie.obj
@@ -1,322 +1,322 @@
-# Made in Blockbench 4.9.4
+# Made in Blockbench 4.10.4
 mtllib materials.mtl
 
-o Body
-v 0.25 1.5 0.125
-v 0.25 1.5 -0.125
-v 0.25 0.75 0.125
-v 0.25 0.75 -0.125
-v -0.25 1.5 -0.125
-v -0.25 1.5 0.125
-v -0.25 0.75 -0.125
-v -0.25 0.75 0.125
-vt 0.3125 0.375
-vt 0.4375 0.375
-vt 0.4375 0
-vt 0.3125 0
-vt 0.25 0.375
-vt 0.3125 0.375
-vt 0.3125 0
-vt 0.25 0
-vt 0.5 0.375
-vt 0.625 0.375
-vt 0.625 0
-vt 0.5 0
-vt 0.4375 0.375
-vt 0.5 0.375
-vt 0.5 0
-vt 0.4375 0
-vt 0.4375 0.375
-vt 0.3125 0.375
-vt 0.3125 0.5
-vt 0.4375 0.5
-vt 0.5625 0.5
-vt 0.4375 0.5
-vt 0.4375 0.375
-vt 0.5625 0.375
+o /head
+v 0.125 1 0.125
+v 0.125 1 -0.125
+v 0.125 0.75 0.125
+v 0.125 0.75 -0.125
+v -0.125 1 -0.125
+v -0.125 1 0.125
+v -0.125 0.75 -0.125
+v -0.125 0.75 0.125
+vt 0.125 0.875
+vt 0.25 0.875
+vt 0.25 0.75
+vt 0.125 0.75
+vt 0 0.875
+vt 0.125 0.875
+vt 0.125 0.75
+vt 0 0.75
+vt 0.375 0.875
+vt 0.5 0.875
+vt 0.5 0.75
+vt 0.375 0.75
+vt 0.25 0.875
+vt 0.375 0.875
+vt 0.375 0.75
+vt 0.25 0.75
+vt 0.25 0.875
+vt 0.125 0.875
+vt 0.125 1
+vt 0.25 1
+vt 0.25 1
+vt 0.375 1
+vt 0.375 0.875
+vt 0.25 0.875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 4/4/1 7/3/1 5/2/1 2/1/1
 f 3/8/2 4/7/2 2/6/2 1/5/2
 f 8/12/3 3/11/3 1/10/3 6/9/3
 f 7/16/4 8/15/4 6/14/4 5/13/4
 f 6/20/5 1/19/5 2/18/5 5/17/5
 f 7/24/6 4/23/6 3/22/6 8/21/6
-o Head
-v 0.25 2 0.25
-v 0.25 2 -0.25
-v 0.25 1.5 0.25
-v 0.25 1.5 -0.25
-v -0.25 2 -0.25
-v -0.25 2 0.25
-v -0.25 1.5 -0.25
-v -0.25 1.5 0.25
-vt 0.125 0.75
-vt 0.25 0.75
-vt 0.25 0.5
-vt 0.125 0.5
-vt 0 0.75
-vt 0.125 0.75
-vt 0.125 0.5
-vt 0 0.5
-vt 0.375 0.75
-vt 0.5 0.75
-vt 0.5 0.5
-vt 0.375 0.5
-vt 0.25 0.75
-vt 0.375 0.75
-vt 0.375 0.5
-vt 0.25 0.5
-vt 0.25 0.75
-vt 0.125 0.75
-vt 0.125 1
-vt 0.25 1
-vt 0.375 1
-vt 0.25 1
-vt 0.25 0.75
-vt 0.375 0.75
+o /right_arm
+v -0.125 0.75 0.0625
+v -0.125 0.75 -0.0625
+v -0.125 0.375 0.0625
+v -0.125 0.375 -0.0625
+v -0.25 0.75 -0.0625
+v -0.25 0.75 0.0625
+v -0.25 0.375 -0.0625
+v -0.25 0.375 0.0625
+vt 0.6875 0.6875
+vt 0.75 0.6875
+vt 0.75 0.5
+vt 0.6875 0.5
+vt 0.625 0.6875
+vt 0.6875 0.6875
+vt 0.6875 0.5
+vt 0.625 0.5
+vt 0.8125 0.6875
+vt 0.875 0.6875
+vt 0.875 0.5
+vt 0.8125 0.5
+vt 0.75 0.6875
+vt 0.8125 0.6875
+vt 0.8125 0.5
+vt 0.75 0.5
+vt 0.75 0.6875
+vt 0.6875 0.6875
+vt 0.6875 0.75
+vt 0.75 0.75
+vt 0.75 0.75
+vt 0.8125 0.75
+vt 0.8125 0.6875
+vt 0.75 0.6875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 12/28/7 15/27/7 13/26/7 10/25/7
 f 11/32/8 12/31/8 10/30/8 9/29/8
 f 16/36/9 11/35/9 9/34/9 14/33/9
 f 15/40/10 16/39/10 14/38/10 13/37/10
 f 14/44/11 9/43/11 10/42/11 13/41/11
 f 15/48/12 12/47/12 11/46/12 16/45/12
-o Hat Layer
-v 0.28125 2.03125 0.28125
-v 0.28125 2.03125 -0.28125
-v 0.28125 1.46875 0.28125
-v 0.28125 1.46875 -0.28125
-v -0.28125 2.03125 -0.28125
-v -0.28125 2.03125 0.28125
-v -0.28125 1.46875 -0.28125
-v -0.28125 1.46875 0.28125
-vt 0.625 0.75
-vt 0.75 0.75
-vt 0.75 0.5
-vt 0.625 0.5
-vt 0.5 0.75
-vt 0.625 0.75
-vt 0.625 0.5
-vt 0.5 0.5
-vt 0.875 0.75
-vt 1 0.75
-vt 1 0.5
-vt 0.875 0.5
-vt 0.75 0.75
-vt 0.875 0.75
-vt 0.875 0.5
-vt 0.75 0.5
-vt 0.75 0.75
-vt 0.625 0.75
-vt 0.625 1
-vt 0.75 1
-vt 0.875 1
-vt 0.75 1
-vt 0.75 0.75
-vt 0.875 0.75
+o /left_leg
+v 0.12187499999999996 0.375 0.0625
+v 0.12187499999999996 0.375 -0.0625
+v 0.12187499999999996 0 0.0625
+v 0.12187499999999996 0 -0.0625
+v -0.003124999999999989 0.375 -0.0625
+v -0.003124999999999989 0.375 0.0625
+v -0.003124999999999989 0 -0.0625
+v -0.003124999999999989 0 0.0625
+vt 0.0625 0.6875
+vt 0.125 0.6875
+vt 0.125 0.5
+vt 0.0625 0.5
+vt 0 0.6875
+vt 0.0625 0.6875
+vt 0.0625 0.5
+vt 0 0.5
+vt 0.1875 0.6875
+vt 0.25 0.6875
+vt 0.25 0.5
+vt 0.1875 0.5
+vt 0.125 0.6875
+vt 0.1875 0.6875
+vt 0.1875 0.5
+vt 0.125 0.5
+vt 0.125 0.6875
+vt 0.0625 0.6875
+vt 0.0625 0.75
+vt 0.125 0.75
+vt 0.125 0.75
+vt 0.1875 0.75
+vt 0.1875 0.6875
+vt 0.125 0.6875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 20/52/13 23/51/13 21/50/13 18/49/13
 f 19/56/14 20/55/14 18/54/14 17/53/14
 f 24/60/15 19/59/15 17/58/15 22/57/15
 f 23/64/16 24/63/16 22/62/16 21/61/16
 f 22/68/17 17/67/17 18/66/17 21/65/17
 f 23/72/18 20/71/18 19/70/18 24/69/18
-o RightArm
-v 0.5 1.5 0.125
-v 0.5 1.5 -0.125
-v 0.5 0.75 0.125
-v 0.5 0.75 -0.125
-v 0.25 1.5 -0.125
-v 0.25 1.5 0.125
-v 0.25 0.75 -0.125
-v 0.25 0.75 0.125
-vt 0.6875 0.375
-vt 0.75 0.375
-vt 0.75 0
-vt 0.6875 0
-vt 0.625 0.375
-vt 0.6875 0.375
-vt 0.6875 0
-vt 0.625 0
-vt 0.8125 0.375
-vt 0.875 0.375
-vt 0.875 0
-vt 0.8125 0
-vt 0.75 0.375
-vt 0.8125 0.375
-vt 0.8125 0
-vt 0.75 0
-vt 0.75 0.375
-vt 0.6875 0.375
-vt 0.6875 0.5
+o /left_arm
+v 0.25 0.75 0.0625
+v 0.25 0.75 -0.0625
+v 0.25 0.375 0.0625
+v 0.25 0.375 -0.0625
+v 0.125 0.75 -0.0625
+v 0.125 0.75 0.0625
+v 0.125 0.375 -0.0625
+v 0.125 0.375 0.0625
+vt 0.6875 0.6875
+vt 0.75 0.6875
 vt 0.75 0.5
+vt 0.6875 0.5
+vt 0.625 0.6875
+vt 0.6875 0.6875
+vt 0.6875 0.5
+vt 0.625 0.5
+vt 0.8125 0.6875
+vt 0.875 0.6875
+vt 0.875 0.5
+vt 0.8125 0.5
+vt 0.75 0.6875
+vt 0.8125 0.6875
 vt 0.8125 0.5
 vt 0.75 0.5
-vt 0.75 0.375
-vt 0.8125 0.375
+vt 0.75 0.6875
+vt 0.6875 0.6875
+vt 0.6875 0.75
+vt 0.75 0.75
+vt 0.75 0.75
+vt 0.8125 0.75
+vt 0.8125 0.6875
+vt 0.75 0.6875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 28/76/19 31/75/19 29/74/19 26/73/19
 f 27/80/20 28/79/20 26/78/20 25/77/20
 f 32/84/21 27/83/21 25/82/21 30/81/21
 f 31/88/22 32/87/22 30/86/22 29/85/22
 f 30/92/23 25/91/23 26/90/23 29/89/23
 f 31/96/24 28/95/24 27/94/24 32/93/24
-o LeftArm
-v -0.25 1.5 0.125
-v -0.25 1.5 -0.125
-v -0.25 0.75 0.125
-v -0.25 0.75 -0.125
-v -0.5 1.5 -0.125
-v -0.5 1.5 0.125
-v -0.5 0.75 -0.125
-v -0.5 0.75 0.125
-vt 0.75 0.375
-vt 0.6875 0.375
-vt 0.6875 0
-vt 0.75 0
-vt 0.8125 0.375
-vt 0.75 0.375
-vt 0.75 0
-vt 0.8125 0
-vt 0.875 0.375
-vt 0.8125 0.375
-vt 0.8125 0
-vt 0.875 0
-vt 0.6875 0.375
-vt 0.625 0.375
-vt 0.625 0
-vt 0.6875 0
-vt 0.6875 0.375
-vt 0.75 0.375
-vt 0.75 0.5
-vt 0.6875 0.5
-vt 0.75 0.5
-vt 0.8125 0.5
-vt 0.8125 0.375
-vt 0.75 0.375
+o /right_leg
+v 0.0031250000000000444 0.375 0.0625
+v 0.0031250000000000444 0.375 -0.0625
+v 0.0031250000000000444 0 0.0625
+v 0.0031250000000000444 0 -0.0625
+v -0.12187500000000001 0.375 -0.0625
+v -0.12187500000000001 0.375 0.0625
+v -0.12187500000000001 0 -0.0625
+v -0.12187500000000001 0 0.0625
+vt 0.0625 0.6875
+vt 0.125 0.6875
+vt 0.125 0.5
+vt 0.0625 0.5
+vt 0 0.6875
+vt 0.0625 0.6875
+vt 0.0625 0.5
+vt 0 0.5
+vt 0.1875 0.6875
+vt 0.25 0.6875
+vt 0.25 0.5
+vt 0.1875 0.5
+vt 0.125 0.6875
+vt 0.1875 0.6875
+vt 0.1875 0.5
+vt 0.125 0.5
+vt 0.125 0.6875
+vt 0.0625 0.6875
+vt 0.0625 0.75
+vt 0.125 0.75
+vt 0.125 0.75
+vt 0.1875 0.75
+vt 0.1875 0.6875
+vt 0.125 0.6875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 36/100/25 39/99/25 37/98/25 34/97/25
 f 35/104/26 36/103/26 34/102/26 33/101/26
 f 40/108/27 35/107/27 33/106/27 38/105/27
 f 39/112/28 40/111/28 38/110/28 37/109/28
 f 38/116/29 33/115/29 34/114/29 37/113/29
 f 39/120/30 36/119/30 35/118/30 40/117/30
-o RightLeg
-v 0.24375000000000002 0.75 0.125
-v 0.24375000000000002 0.75 -0.125
-v 0.24375000000000002 0 0.125
-v 0.24375000000000002 0 -0.125
-v -0.006249999999999978 0.75 -0.125
-v -0.006249999999999978 0.75 0.125
-v -0.006249999999999978 0 -0.125
-v -0.006249999999999978 0 0.125
-vt 0.0625 0.375
-vt 0.125 0.375
-vt 0.125 0
-vt 0.0625 0
-vt 0 0.375
-vt 0.0625 0.375
-vt 0.0625 0
-vt 0 0
-vt 0.1875 0.375
-vt 0.25 0.375
-vt 0.25 0
-vt 0.1875 0
-vt 0.125 0.375
-vt 0.1875 0.375
-vt 0.1875 0
-vt 0.125 0
-vt 0.125 0.375
-vt 0.0625 0.375
-vt 0.0625 0.5
-vt 0.125 0.5
-vt 0.1875 0.5
-vt 0.125 0.5
-vt 0.125 0.375
-vt 0.1875 0.375
+o /hat
+v 0.140625 1.015625 0.140625
+v 0.140625 1.015625 -0.140625
+v 0.140625 0.734375 0.140625
+v 0.140625 0.734375 -0.140625
+v -0.140625 1.015625 -0.140625
+v -0.140625 1.015625 0.140625
+v -0.140625 0.734375 -0.140625
+v -0.140625 0.734375 0.140625
+vt 0.625 0.875
+vt 0.75 0.875
+vt 0.75 0.75
+vt 0.625 0.75
+vt 0.5 0.875
+vt 0.625 0.875
+vt 0.625 0.75
+vt 0.5 0.75
+vt 0.875 0.875
+vt 1 0.875
+vt 1 0.75
+vt 0.875 0.75
+vt 0.75 0.875
+vt 0.875 0.875
+vt 0.875 0.75
+vt 0.75 0.75
+vt 0.75 0.875
+vt 0.625 0.875
+vt 0.625 1
+vt 0.75 1
+vt 0.75 1
+vt 0.875 1
+vt 0.875 0.875
+vt 0.75 0.875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 44/124/31 47/123/31 45/122/31 42/121/31
 f 43/128/32 44/127/32 42/126/32 41/125/32
 f 48/132/33 43/131/33 41/130/33 46/129/33
 f 47/136/34 48/135/34 46/134/34 45/133/34
 f 46/140/35 41/139/35 42/138/35 45/137/35
 f 47/144/36 44/143/36 43/142/36 48/141/36
-o LeftLeg
-v 0.006249999999999978 0.75 0.125
-v 0.006249999999999978 0.75 -0.125
-v 0.006249999999999978 0 0.125
-v 0.006249999999999978 0 -0.125
-v -0.24375000000000002 0.75 -0.125
-v -0.24375000000000002 0.75 0.125
-v -0.24375000000000002 0 -0.125
-v -0.24375000000000002 0 0.125
-vt 0.125 0.375
-vt 0.0625 0.375
-vt 0.0625 0
-vt 0.125 0
-vt 0.1875 0.375
-vt 0.125 0.375
-vt 0.125 0
-vt 0.1875 0
-vt 0.25 0.375
-vt 0.1875 0.375
-vt 0.1875 0
-vt 0.25 0
-vt 0.0625 0.375
-vt 0 0.375
-vt 0 0
-vt 0.0625 0
-vt 0.0625 0.375
-vt 0.125 0.375
-vt 0.125 0.5
-vt 0.0625 0.5
-vt 0.125 0.5
-vt 0.1875 0.5
-vt 0.1875 0.375
-vt 0.125 0.375
+o /body
+v 0.125 0.75 0.0625
+v 0.125 0.75 -0.0625
+v 0.125 0.375 0.0625
+v 0.125 0.375 -0.0625
+v -0.125 0.75 -0.0625
+v -0.125 0.75 0.0625
+v -0.125 0.375 -0.0625
+v -0.125 0.375 0.0625
+vt 0.3125 0.6875
+vt 0.4375 0.6875
+vt 0.4375 0.5
+vt 0.3125 0.5
+vt 0.25 0.6875
+vt 0.3125 0.6875
+vt 0.3125 0.5
+vt 0.25 0.5
+vt 0.5 0.6875
+vt 0.625 0.6875
+vt 0.625 0.5
+vt 0.5 0.5
+vt 0.4375 0.6875
+vt 0.5 0.6875
+vt 0.5 0.5
+vt 0.4375 0.5
+vt 0.4375 0.6875
+vt 0.3125 0.6875
+vt 0.3125 0.75
+vt 0.4375 0.75
+vt 0.4375 0.75
+vt 0.5625 0.75
+vt 0.5625 0.6875
+vt 0.4375 0.6875
 vn 0 0 -1
 vn 1 0 0
 vn 0 0 1
 vn -1 0 0
 vn 0 1 0
 vn 0 -1 0
-usemtl m_9eb5cf2e-0212-52a4-6070-8cb3b67f2e24
+usemtl none
 f 52/148/37 55/147/37 53/146/37 50/145/37
 f 51/152/38 52/151/38 50/150/38 49/149/38
 f 56/156/39 51/155/39 49/154/39 54/153/39