diff --git a/build.gradle b/build.gradle index 687c9aa..7b375b0 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ repositories { } dependencies { - compileOnly 'net.industrial-craft:industrialcraft-2:2.8.+' + deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+' deobfCompile "blusunrize:ImmersiveEngineering:0.12-+:deobf" compileOnly "TechReborn:TechReborn-1.12:2.6.+:dev" compileOnly "RebornCore:RebornCore-1.12:3.2.+:dev" diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj index aa06fbe..6061215 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj @@ -2,14 +2,14 @@ # www.blender.org mtllib commutator.mtl o Commutator_Cube.038 -v 0.125000 0.343750 0.625000 -v 0.125000 0.875000 0.625000 -v 0.000000 0.343750 0.625000 -v 0.000000 0.875000 0.625000 -v 0.125000 0.343750 0.375000 -v 0.125000 0.875000 0.375000 -v 0.000000 0.343750 0.375000 -v 0.000000 0.875000 0.375000 +v 0.125000 0.343750 0.500000 +v 0.125000 0.875000 0.500000 +v 0.000000 0.343750 0.500000 +v 0.000000 0.875000 0.500000 +v 0.125000 0.343750 0.250000 +v 0.125000 0.875000 0.250000 +v 0.000000 0.343750 0.250000 +v 0.000000 0.875000 0.250000 v 1.000000 0.875000 1.000000 v 1.000000 1.000000 1.000000 v 0.000000 0.875000 1.000000 @@ -18,30 +18,30 @@ v 1.000000 0.875000 0.000000 v 1.000000 1.000000 0.000000 v 0.000000 0.875000 0.000000 v 0.000000 1.000000 0.000000 -v 0.000000 0.406250 0.562500 -v 0.500000 0.406250 0.562500 -v 0.000000 0.593750 0.562500 -v 0.500000 0.593750 0.562500 v 0.000000 0.406250 0.437500 v 0.500000 0.406250 0.437500 v 0.000000 0.593750 0.437500 v 0.500000 0.593750 0.437500 +v 0.000000 0.406250 0.312500 +v 0.500000 0.406250 0.312500 +v 0.000000 0.593750 0.312500 +v 0.500000 0.593750 0.312500 +v 0.500000 0.406250 0.687500 +v 1.000000 0.406250 0.687500 +v 0.500000 0.593750 0.687500 +v 1.000000 0.593750 0.687500 v 0.500000 0.406250 0.562500 v 1.000000 0.406250 0.562500 v 0.500000 0.593750 0.562500 v 1.000000 0.593750 0.562500 -v 0.500000 0.406250 0.437500 -v 1.000000 0.406250 0.437500 -v 0.500000 0.593750 0.437500 -v 1.000000 0.593750 0.437500 -v 1.000000 0.343750 0.625000 -v 1.000000 0.875000 0.625000 -v 0.875000 0.343750 0.625000 -v 0.875000 0.875000 0.625000 -v 1.000000 0.343750 0.375000 -v 1.000000 0.875000 0.375000 -v 0.875000 0.343750 0.375000 -v 0.875000 0.875000 0.375000 +v 1.000000 0.343750 0.750000 +v 1.000000 0.875000 0.750000 +v 0.875000 0.343750 0.750000 +v 0.875000 0.875000 0.750000 +v 1.000000 0.343750 0.500000 +v 1.000000 0.875000 0.500000 +v 0.875000 0.343750 0.500000 +v 0.875000 0.875000 0.500000 vt 0.000000 0.541667 vt 0.166667 0.541667 vt 0.166667 0.583333 @@ -136,6 +136,10 @@ vt 0.000000 0.583333 vt 0.000000 0.583333 vt 0.041667 0.500000 vt 0.041667 0.583333 +vt 0.291667 0.666667 +vt 0.291667 0.583333 +vt 0.041667 0.666667 +vt 0.041667 0.583333 vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 @@ -167,3 +171,5 @@ f 35/80/2 36/81/2 40/82/2 39/83/2 f 39/84/3 40/85/3 38/86/3 37/87/3 f 37/88/4 38/89/4 34/90/4 33/91/4 f 35/92/5 39/84/5 37/93/5 33/94/5 +f 18/45/4 22/95/4 24/96/4 20/46/4 +f 27/97/2 31/68/2 29/71/2 25/98/2 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj index d211ca5..51a9fc8 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj @@ -1,70 +1,107 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org -mtllib end.mtl -o End.001_Cube.000 -v 0.000000 0.500000 0.750000 -v 0.000000 0.500000 0.250000 -v 1.000000 0.500000 0.750000 -v 1.000000 0.500000 0.250000 -v 0.853553 0.853553 0.750000 -v 0.853553 0.853554 0.250000 -v 0.500000 1.000000 0.750000 -v 0.500000 1.000000 0.250000 -v 0.146447 0.853553 0.750000 -v 0.146447 0.853554 0.250000 -v 1.000000 -1.000000 0.750000 -v 1.000000 0.500000 0.750000 -v 0.000000 -1.000000 0.750000 -v 0.000000 0.500000 0.750000 -v 1.000000 -1.000000 0.250000 -v 1.000000 0.500000 0.250000 -v 0.000000 -1.000000 0.250000 -v 0.000000 0.500000 0.250000 -v 0.500000 0.500000 0.750000 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.1250 0.4062 -vt 0.3750 0.4062 -vt 0.3750 0.5938 -vt 0.1250 0.5938 -vt 0.8750 0.5938 -vt 0.6250 0.5938 -vt 0.6250 0.4062 -vt 0.8750 0.4062 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.5000 0.0000 -vt 0.5000 0.7500 -vt 0.0000 0.7500 -vt -0.0000 0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 -0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 0.0000 -vt 0.0000 0.6250 -vt 0.0000 0.3750 -vt 0.5000 0.3750 -vt 0.5000 0.6250 -vt 0.4062 0.9375 -vt 0.0938 0.9375 -vt 0.2188 1.0000 -vt 0.0625 0.9375 -vt 0.5312 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.7500 -vt 0.5312 0.7500 -vt 0.5938 0.9375 -vt 0.5000 0.7500 -vt 0.9062 0.9375 -vt 0.7500 1.0000 +mtllib end_other.mtl +o End.001_Cube.003 +v 0.000000 0.500000 0.732759 +v 0.000000 0.500000 0.232759 +v 1.000000 0.500000 0.732759 +v 1.000000 0.500000 0.232759 +v 0.853553 0.853553 0.732759 +v 0.853553 0.853554 0.232759 +v 0.500000 1.000000 0.732759 +v 0.500000 1.000000 0.232759 +v 0.146447 0.853553 0.732759 +v 0.146447 0.853554 0.232759 +v 1.000000 -1.000000 0.732759 +v 1.000000 0.500000 0.732759 +v 0.000000 -1.000000 0.732759 +v 0.000000 0.500000 0.732759 +v 1.000000 -1.000000 0.232759 +v 1.000000 0.500000 0.232759 +v 0.000000 -1.000000 0.232759 +v 0.000000 0.500000 0.232759 +v 0.500000 0.500000 0.732759 +v 0.853553 0.853553 0.732759 +v 0.500000 1.000000 0.732759 +v 0.500000 1.000000 0.232759 +v 0.853553 0.853554 0.232759 +v 0.146447 0.853553 0.732759 +v 0.146447 0.853554 0.232759 +v 0.000000 0.500000 0.232759 +v 1.000000 0.500000 0.232759 +v 1.000000 0.500000 0.732759 +v 0.000000 0.500000 0.732759 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.125000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.125000 0.593750 +vt 0.875000 0.593750 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.875000 0.406250 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.500000 0.000000 +vt 0.500000 0.750000 +vt 0.000000 0.750000 +vt -0.000000 0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 -0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 0.000000 +vt 0.000000 0.625000 +vt 0.000000 0.375000 +vt 0.500000 0.375000 +vt 0.500000 0.625000 +vt 0.125000 0.593750 +vt 0.125000 0.406250 +vt 0.875000 0.406250 +vt 0.875000 0.593750 +vt 0.531250 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.750000 +vt 0.531250 0.750000 +vt 0.500000 0.750000 +vt 0.426777 0.926777 +vt 0.073223 0.926777 +vt -0.000000 0.750000 +vt 0.250000 1.000000 +vt 0.573223 0.926777 +vt 0.500000 0.750000 +vt 1.000000 0.750000 +vt 0.926777 0.926777 +vt 0.750000 1.000000 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.531250 0.750000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 vn 0.9239 0.3827 0.0000 vn 0.3827 0.9239 0.0000 vn -0.3827 0.9239 0.0000 @@ -83,8 +120,18 @@ f 17/17/5 18/18/5 16/19/5 15/20/5 f 13/21/6 14/22/6 18/23/6 17/24/6 f 15/25/7 16/26/7 12/27/7 11/28/7 f 13/29/8 17/30/8 15/31/8 11/32/8 -f 18/18/5 10/33/5 6/34/5 16/19/5 -f 8/35/5 6/36/5 10/33/5 +f 5/5/9 7/8/9 21/33/9 20/34/9 +f 7/9/9 9/12/9 24/35/9 21/36/9 f 13/37/9 11/38/9 12/39/9 14/40/9 -f 9/41/9 14/42/9 12/39/9 5/43/9 -f 5/43/9 7/44/9 9/41/9 +f 26/41/5 25/42/5 23/43/5 27/44/5 +f 22/45/5 23/43/5 25/42/5 +f 24/46/9 29/47/9 28/48/9 20/49/9 +f 20/49/9 21/50/9 24/46/9 +f 10/11/9 8/10/9 22/51/9 25/52/9 +f 8/7/9 6/6/9 23/53/9 22/54/9 +f 16/19/9 18/18/9 26/41/9 27/44/9 +f 14/40/9 12/39/9 28/48/9 29/55/9 +f 9/56/9 14/57/9 29/58/9 24/59/9 +f 18/60/9 10/61/9 25/62/9 26/63/9 +f 6/64/9 16/65/9 27/66/9 23/67/9 +f 12/68/9 5/69/9 20/70/9 28/71/9 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj index ef9a5c8..23c10de 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj @@ -1,6 +1,6 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org -mtllib end_other.mtl +mtllib end.mtl o End.000_Cube.001 v 1.000000 0.500000 0.250000 v 1.000000 0.500000 0.750000 @@ -21,50 +21,87 @@ v 0.000000 0.500000 0.750000 v 1.000000 -1.000000 0.750000 v 1.000000 0.500000 0.750000 v 0.500000 0.500000 0.250000 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.1250 0.4062 -vt 0.3750 0.4062 -vt 0.3750 0.5938 -vt 0.1250 0.5938 -vt 0.8750 0.5938 -vt 0.6250 0.5938 -vt 0.6250 0.4062 -vt 0.8750 0.4062 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.5000 0.0000 -vt 0.5000 0.7500 -vt 0.0000 0.7500 -vt -0.0000 0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 -0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 0.0000 -vt 0.0000 0.6250 -vt 0.0000 0.3750 -vt 0.5000 0.3750 -vt 0.5000 0.6250 -vt 0.4062 0.9375 -vt 0.0938 0.9375 -vt 0.2188 1.0000 -vt 0.0625 0.9375 -vt 0.5312 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.7500 -vt 0.5312 0.7500 -vt 0.5938 0.9375 -vt 0.5000 0.7500 -vt 0.9062 0.9375 -vt 0.7500 1.0000 +v 0.146447 0.853553 0.250000 +v 0.500000 1.000000 0.250000 +v 0.500000 1.000000 0.750000 +v 0.146447 0.853554 0.750000 +v 0.853553 0.853553 0.250000 +v 0.853553 0.853554 0.750000 +v 1.000000 0.500000 0.750000 +v 0.000000 0.500000 0.750000 +v 0.000000 0.500000 0.250000 +v 1.000000 0.500000 0.250000 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.125000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.125000 0.593750 +vt 0.875000 0.593750 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.875000 0.406250 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.500000 0.000000 +vt 0.500000 0.750000 +vt 0.000000 0.750000 +vt -0.000000 0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 -0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 0.000000 +vt 0.000000 0.625000 +vt 0.000000 0.375000 +vt 0.500000 0.375000 +vt 0.500000 0.625000 +vt 0.125000 0.593750 +vt 0.125000 0.406250 +vt 0.875000 0.406250 +vt 0.875000 0.593750 +vt 0.531250 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.750000 +vt 0.531250 0.750000 +vt 0.500000 0.750000 +vt 0.426777 0.926777 +vt 0.073223 0.926777 +vt -0.000000 0.750000 +vt 0.250000 1.000000 +vt 0.573223 0.926777 +vt 0.500000 0.750000 +vt 1.000000 0.750000 +vt 0.926777 0.926777 +vt 0.750000 1.000000 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.531250 0.750000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 vn -0.9239 0.3827 -0.0000 vn -0.3827 0.9239 -0.0000 vn 0.3827 0.9239 -0.0000 @@ -83,8 +120,18 @@ f 17/17/5 18/18/5 16/19/5 15/20/5 f 13/21/6 14/22/6 18/23/6 17/24/6 f 15/25/7 16/26/7 12/27/7 11/28/7 f 13/29/8 17/30/8 15/31/8 11/32/8 -f 18/18/5 10/33/5 6/34/5 16/19/5 -f 8/35/5 6/36/5 10/33/5 +f 5/5/5 7/8/5 21/33/5 20/34/5 +f 7/9/5 9/12/5 24/35/5 21/36/5 f 13/37/9 11/38/9 12/39/9 14/40/9 -f 9/41/9 14/42/9 12/39/9 5/43/9 -f 5/43/9 7/44/9 9/41/9 +f 26/41/5 25/42/5 23/43/5 27/44/5 +f 22/45/5 23/43/5 25/42/5 +f 24/46/9 29/47/9 28/48/9 20/49/9 +f 20/49/9 21/50/9 24/46/9 +f 10/11/5 8/10/5 22/51/5 25/52/5 +f 8/7/5 6/6/5 23/53/5 22/54/5 +f 16/19/5 18/18/5 26/41/5 27/44/5 +f 14/40/5 12/39/5 28/48/5 29/55/5 +f 9/56/5 14/57/5 29/58/5 24/59/5 +f 18/60/5 10/61/5 25/62/5 26/63/5 +f 6/64/5 16/65/5 27/66/5 23/67/5 +f 12/68/5 5/69/5 20/70/5 28/71/5 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj index d1d303a..908ab99 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj @@ -1,4 +1,4 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft.mtl o Shaft_Cylinder.004 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.1875 1.0000 -vt 0.1875 0.0000 -vt 0.2500 0.0000 -vt 0.2500 1.0000 -vt 0.1250 1.0000 -vt 0.1250 0.0000 -vt 0.1875 0.0000 -vt 0.1875 1.0000 -vt 0.0625 1.0000 -vt 0.0625 -0.0000 -vt 0.1250 -0.0000 -vt 0.1250 1.0000 -vt -0.0000 1.0000 -vt -0.0000 0.0000 -vt 0.0625 0.0000 -vt 0.0625 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.4375 1.0000 -vt 0.4375 0.0000 -vt 0.3750 1.0000 -vt 0.3750 0.0000 -vt 0.4375 0.0000 -vt 0.4375 1.0000 -vt 0.3125 1.0000 -vt 0.3125 0.0000 -vt 0.3750 0.0000 -vt 0.3750 1.0000 -vt 0.2500 1.0000 -vt 0.2500 0.0000 -vt 0.3125 0.0000 -vt 0.3125 1.0000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt -0.000000 1.000000 +vt -0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.062500 1.000000 +vt 0.125000 -0.000000 +vt 0.125000 1.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 1.000000 +vt 0.187500 0.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.062500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/21/7 14/22/7 16/23/7 15/24/7 +f 15/24/8 16/23/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj index 1ca377d..1d52b31 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft2.mtl -o Shaft2_Cylinder.005 +o Shaft2_Cylinder.011 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 -0.0000 -vt 0.5625 -0.0000 -vt 0.5625 1.0000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.437500 0.000000 +vt 0.437500 1.000000 +vt 0.500000 0.000000 +vt 0.500000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt 0.375000 0.000000 +vt 0.375000 1.000000 +vt 0.437500 0.000000 +vt 0.437500 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.437500 1.000000 +vt 0.437500 0.000000 +vt 0.500000 0.000000 +vt 0.500000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/21/7 14/22/7 16/23/7 15/24/7 +f 15/24/8 16/23/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj index 3e5bacc..da367fa 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft4.mtl -o Shaft4_Cylinder.003 +o Shaft4_Cylinder.010 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,34 +18,26 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 -0.0000 -vt 0.6250 1.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.6875 -0.0000 -vt 0.6875 1.0000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 -0.0000 -vt 0.6250 1.0000 -vt 0.6875 0.0000 -vt 0.6875 1.0000 -vt 0.6250 1.0000 -vt 0.6250 0.0000 -vt 0.6875 0.0000 -vt 0.6875 1.0000 +vt 0.625000 1.000000 +vt 0.625000 0.000000 +vt 0.687500 0.000000 +vt 0.687500 1.000000 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.562500 0.000000 +vt 0.562500 1.000000 +vt 0.625000 0.000000 +vt 0.625000 1.000000 +vt 0.687500 0.000000 +vt 0.687500 1.000000 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.562500 0.000000 +vt 0.562500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -56,10 +48,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/8/3 6/7/3 8/9/3 7/10/3 -f 7/11/4 8/12/4 10/13/4 9/14/4 -f 9/15/5 10/16/5 12/17/5 11/18/5 -f 11/19/6 12/20/6 14/21/6 13/22/6 -f 13/22/7 14/21/7 16/23/7 15/24/7 -f 15/25/8 16/26/8 2/27/8 1/28/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/12/5 10/11/5 12/13/5 11/14/5 +f 11/14/6 12/13/6 14/15/6 13/16/6 +f 13/17/7 14/18/7 16/19/7 15/20/7 +f 15/20/8 16/19/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj index 7db6abb..1101ad3 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft_comm.mtl -o ShaftComm_Cylinder.001 +o ShaftComm_Cylinder.006 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.6875 1.0000 -vt 0.6875 0.0000 -vt 0.7500 -0.0000 -vt 0.7500 1.0000 -vt 0.1250 1.0000 -vt 0.1250 0.0000 -vt 0.1875 0.0000 -vt 0.1875 1.0000 -vt 0.0625 1.0000 -vt 0.0625 -0.0000 -vt 0.1250 -0.0000 -vt 0.1250 1.0000 -vt -0.0000 1.0000 -vt -0.0000 0.0000 -vt 0.0625 0.0000 -vt 0.0625 1.0000 -vt 0.7500 0.0000 -vt 0.7500 1.0000 -vt 0.6875 1.0000 -vt 0.6875 0.0000 -vt 0.3750 1.0000 -vt 0.3750 0.0000 -vt 0.4375 0.0000 -vt 0.4375 1.0000 -vt 0.3125 1.0000 -vt 0.3125 0.0000 -vt 0.3750 0.0000 -vt 0.3750 1.0000 -vt 0.2500 1.0000 -vt 0.2500 0.0000 -vt 0.3125 0.0000 -vt 0.3125 1.0000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt -0.000000 1.000000 +vt -0.000000 0.000000 +vt 0.062500 0.000000 +vt 0.062500 1.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 1.000000 +vt 0.187500 0.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt 0.062500 1.000000 +vt 0.062500 0.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/6/3 6/5/3 8/7/3 7/8/3 +f 7/9/4 8/10/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/20/7 14/19/7 16/21/7 15/22/7 +f 15/23/8 16/24/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj index e0874e2..380049c 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj @@ -1,7 +1,7 @@ # Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft_comm4.mtl -o ShaftComm4_Cylinder.002 +o ShaftComm4_Cylinder.009 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -20,36 +20,24 @@ v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 vt 0.875000 1.000000 vt 0.875000 -0.000000 -vt 0.937500 0.000000 +vt 0.937500 -0.000000 vt 0.937500 1.000000 -vt 0.875000 0.000000 -vt 0.875000 1.000000 -vt 0.812500 1.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 +vt 1.000000 -0.000000 +vt 1.000000 1.000000 +vt 0.750000 1.000000 +vt 0.750000 -0.000000 vt 0.812500 -0.000000 -vt 0.875000 0.000000 +vt 0.812500 1.000000 +vt 0.875000 -0.000000 vt 0.875000 1.000000 vt 0.937500 0.000000 vt 0.937500 1.000000 -vt 0.875000 1.000000 -vt 0.875000 0.000000 -vt 0.750000 1.000000 -vt 0.750000 0.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 -vt 1.000000 0.000000 +vt 1.000000 -0.000000 vt 1.000000 1.000000 -vt 0.937500 1.000000 -vt 0.937500 0.000000 -vt 0.937500 1.000000 -vt 0.937500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 vt 0.750000 1.000000 -vt 0.750000 0.000000 +vt 0.750000 -0.000000 +vt 0.812500 -0.000000 +vt 0.812500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +48,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/12/5 10/11/5 12/13/5 11/14/5 +f 11/14/6 12/13/6 14/15/6 13/16/6 +f 13/17/7 14/18/7 16/19/7 15/20/7 +f 15/20/8 16/19/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png b/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png index 459b14b..70ef4cf 100644 Binary files a/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png and b/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png differ diff --git a/src/main/resources/assets/industrialwires/textures/blocks/marx.png b/src/main/resources/assets/industrialwires/textures/blocks/marx.png index 749dcfe..a7f324b 100644 Binary files a/src/main/resources/assets/industrialwires/textures/blocks/marx.png and b/src/main/resources/assets/industrialwires/textures/blocks/marx.png differ