diff --git a/src/main/resources/assets/hbm/models/blocks/barrel.obj b/src/main/resources/assets/hbm/models/blocks/barrel.obj index a9f9119f4..4a3e6f1d9 100644 --- a/src/main/resources/assets/hbm/models/blocks/barrel.obj +++ b/src/main/resources/assets/hbm/models/blocks/barrel.obj @@ -1,50 +1,6 @@ -# Blender v2.82 (sub 7) OBJ File: 'barrel.blend' +# Blender 5.1.2 # www.blender.org mtllib barrel.mtl -o Connector -v 0.500000 0.687500 0.187500 -v 0.500000 0.312500 -0.187500 -v 0.500000 0.687500 -0.187500 -v 0.375000 0.312500 -0.187500 -v 0.375000 0.687500 0.187500 -v 0.375000 0.687500 -0.187500 -v 0.375000 0.312500 0.187500 -v 0.500000 0.312500 0.187500 -vt 0.145833 0.270833 -vt 0.020833 0.395833 -vt 0.020833 0.270833 -vt 0.020833 0.375000 -vt 0.000000 0.250000 -vt 0.020833 0.250000 -vt 0.166667 0.395833 -vt 0.041667 0.416667 -vt 0.041667 0.395833 -vt 0.145833 0.291667 -vt 0.166667 0.416667 -vt 0.145833 0.416667 -vt 0.000000 0.270833 -vt 0.125000 0.250000 -vt 0.125000 0.270833 -vt 0.145833 0.395833 -vt -0.000000 0.375000 -vt 0.166667 0.291667 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 1.0000 -0.0000 -vn 0.0000 -0.0000 -1.0000 -vn 0.0000 -1.0000 0.0000 -usemtl Default_OBJ -s 1 -f 1/1/1 2/2/1 3/3/1 -f 1/4/2 7/5/2 8/6/2 -f 3/7/3 5/8/3 1/9/3 -f 2/10/4 6/11/4 3/12/4 -f 8/13/5 4/14/5 2/15/5 -f 1/1/1 8/16/1 2/2/1 -f 1/4/2 5/17/2 7/5/2 -f 3/7/3 6/11/3 5/8/3 -f 2/10/4 4/18/4 6/11/4 -f 8/13/5 7/5/5 4/14/5 o Barrel v 0.375000 1.000000 0.375000 v 0.375000 0.000000 0.375000 @@ -54,6 +10,12 @@ v -0.375000 0.000000 0.375000 v -0.375000 1.000000 -0.375000 v -0.375000 -0.000000 -0.375000 v 0.375000 1.000000 -0.375000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 vt 0.000000 0.750000 vt 0.000000 0.416667 vt 0.250000 0.416667 @@ -63,32 +25,67 @@ vt 1.000000 0.416667 vt 0.500000 0.750000 vt 0.500000 0.416667 vt 0.250000 0.750000 -vt 0.750000 0.750000 vt 0.750000 1.000000 vt 0.500000 1.000000 -vt 0.500000 0.750000 -vt 0.500000 1.000000 vt 0.250000 1.000000 vt 1.000000 0.750000 -vt 0.500000 0.750000 -vt 0.250000 0.750000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 -0.0000 -1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 -0.0000 -usemtl Default_OBJ s 1 -f 9/19/6 10/20/6 11/21/6 -f 12/22/7 13/23/7 10/24/7 -f 14/25/8 15/26/8 13/23/8 -f 16/27/9 11/21/9 15/26/9 -f 10/28/10 13/29/10 15/30/10 -f 12/31/11 9/32/11 16/33/11 -f 16/27/6 9/19/6 11/21/6 -f 9/34/7 12/22/7 10/24/7 -f 12/22/8 14/25/8 13/23/8 -f 14/25/9 16/27/9 15/26/9 -f 11/35/10 10/28/10 15/30/10 -f 14/36/11 12/31/11 16/33/11 +usemtl m_2f3dbca4-45a7-429b-31df-58e8185a2095 +f 1/1/1 2/2/1 3/3/1 +f 4/4/2 5/5/2 2/6/2 +f 6/7/3 7/8/3 5/5/3 +f 8/9/4 3/3/4 7/8/4 +f 2/4/5 5/10/5 7/11/5 +f 4/7/6 1/11/6 8/12/6 +f 8/9/1 1/1/1 3/3/1 +f 1/13/2 4/4/2 2/6/2 +f 4/4/3 6/7/3 5/5/3 +f 6/7/4 8/9/4 7/8/4 +f 3/7/5 2/4/5 7/11/5 +f 6/9/6 4/7/6 8/12/6 +o Connector +v 0.500000 0.687500 0.187500 +v 0.500000 0.312500 -0.187500 +v 0.500000 0.687500 -0.187500 +v 0.375000 0.312500 0.187500 +v 0.500000 0.312500 0.187500 +v 0.375000 0.687500 0.187500 +v 0.375000 0.687500 -0.187500 +v 0.375000 0.312500 -0.187500 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -1.0000 -0.0000 +vt 0.041667 0.375000 +vt 0.166667 0.250000 +vt 0.166667 0.375000 +vt 0.041666 0.375000 +vt 0.000000 0.250000 +vt 0.041666 0.250000 +vt 0.166667 0.375000 +vt 0.041667 0.416667 +vt 0.041667 0.375000 +vt 0.166666 0.250000 +vt 0.208334 0.375000 +vt 0.166666 0.375000 +vt 0.041667 0.250000 +vt 0.166667 0.208333 +vt 0.166667 0.250000 +vt 0.041667 0.250000 +vt 0.000000 0.375000 +vt 0.166667 0.416667 +vt 0.208334 0.250000 +vt 0.041667 0.208333 +s 1 +usemtl m_2f3dbca4-45a7-429b-31df-58e8185a2095 +f 9/14/7 10/15/7 11/16/7 +f 9/17/8 12/18/8 13/19/8 +f 11/20/9 14/21/9 9/22/9 +f 10/23/10 15/24/10 11/25/10 +f 13/26/11 16/27/11 10/28/11 +f 9/14/7 13/29/7 10/15/7 +f 9/17/8 14/30/8 12/18/8 +f 11/20/9 15/31/9 14/21/9 +f 10/23/10 16/32/10 15/24/10 +f 13/26/11 12/33/11 16/27/11 diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png b/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png index ed6b74202..87e09bb1d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png and b/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png b/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png index 675349a39..75a4b4ed4 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png and b/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png b/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png index 590b2e695..a2fd66866 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png and b/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png b/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png index 3a74dfde7..5f5fee71f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png and b/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png differ