Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
845550e7a2
GPG Key ID:
DCC23B5715498507
@ -32,6 +32,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
|
||||
provider.block(MBlocks.CHEMICAL_GENERATOR)
|
||||
provider.block(MBlocks.MATTER_SCANNER)
|
||||
provider.block(MBlocks.ITEM_MONITOR)
|
||||
provider.block(MBlocks.HOLO_SIGN)
|
||||
|
||||
provider.exec {
|
||||
with(provider.getMultipartBuilder(MBlocks.PHANTOM_ATTRACTOR)) {
|
||||
|
||||
@ -29,6 +29,8 @@ fun addItemModels(provider: MatteryItemModelProvider) {
|
||||
provider.block(MItems.TRITANIUM_INGOT_BLOCK)
|
||||
provider.block(MItems.ITEM_MONITOR)
|
||||
provider.block(MItems.PHANTOM_ATTRACTOR)
|
||||
provider.block(MItems.HOLO_SIGN)
|
||||
|
||||
|
||||
MRegistry.VENT.allItems.values.forEach(provider::block)
|
||||
MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block)
|
||||
|
||||
@ -0,0 +1,191 @@
|
||||
{
|
||||
"parent": "block/cube_all",
|
||||
"render_type": "translucent",
|
||||
"textures": {
|
||||
"0": "overdrive_that_matters:block/holo_sign",
|
||||
"particle": "overdrive_that_matters:block/holo_sign"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 0, 14],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
|
||||
"east": {"uv": [0, 11.5, 8, 12.5], "rotation": 270, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
|
||||
"west": {"uv": [0, 11.5, 8, 12.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [0, 11.5, 8, 12.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0, 11.5, 8, 12.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [1, 1, 13],
|
||||
"to": [15, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 7, 7], "texture": "#missing"},
|
||||
"east": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 7, 7], "texture": "#missing"},
|
||||
"west": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [0, 11, 7, 11.5], "texture": "#0"},
|
||||
"down": {"uv": [0, 11, 7, 11.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 0, 10],
|
||||
"to": [16, 16, 13],
|
||||
"faces": {
|
||||
"north": {"uv": [8, 0, 16, 8], "texture": "#0"},
|
||||
"east": {"uv": [0, 9.5, 8, 11], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
|
||||
"west": {"uv": [0, 9.5, 8, 11], "rotation": 270, "texture": "#0"},
|
||||
"up": {"uv": [0, 8, 8, 9.5], "texture": "#0"},
|
||||
"down": {"uv": [0, 8, 8, 9.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [14, 5, 9],
|
||||
"to": [16, 11, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [0.5, 12.5, 1.5, 15.5], "texture": "#0"},
|
||||
"east": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
|
||||
"west": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"},
|
||||
"up": {"uv": [1.5, 16, 0.5, 15.5], "texture": "#0"},
|
||||
"down": {"uv": [1.5, 15.5, 0.5, 16], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 5, 9],
|
||||
"to": [2, 11, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [1.5, 12.5, 0.5, 15.5], "texture": "#0"},
|
||||
"east": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
|
||||
"west": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"},
|
||||
"up": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"},
|
||||
"down": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [1, 14, 10],
|
||||
"to": [2, 15, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15},
|
||||
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [1, 1, 10],
|
||||
"to": [2, 2, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15},
|
||||
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [14, 1, 10],
|
||||
"to": [15, 2, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15},
|
||||
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [14, 14, 10],
|
||||
"to": [15, 15, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15},
|
||||
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [14, 6, 9],
|
||||
"to": [14, 10, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
|
||||
"east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
|
||||
"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "light",
|
||||
"from": [2, 6, 9],
|
||||
"to": [2, 10, 10],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
|
||||
"east": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15},
|
||||
"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
|
||||
"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"rotation": [90, 0, 0],
|
||||
"translation": [0, 3, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [2, -1.25, 0],
|
||||
"scale": [0.625, 0.625, 0.625]
|
||||
},
|
||||
"head": {
|
||||
"translation": [0, 0, -10],
|
||||
"scale": [0.94, 0.94, 0.94]
|
||||
},
|
||||
"fixed": {
|
||||
"translation": [0, 0, -2.75],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 418 B |
Loading…
Reference in New Issue
Block a user