fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented quartz fixture model (#34)

Browse Source 
* Implemented the actual quartz fixture model.

* Added a custom texture for the metal bits of the quartz fixture.
This commit is contained in:
shartte
2016-08-16 15:38:24 +02:00
committed by dpeter99
parent 63f426336b
commit 785e40ce3e
9 changed files with 556 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/BlockQuartzTorch.json
+16
View File
@@ -0,0 +1,16 @@
{
"variants": {
"facing=up,odd=false": { "model": "appliedenergistics2:QuartzTorch.standing" },
"facing=down,odd=false": { "model": "appliedenergistics2:QuartzTorch.standing", "x": 180 },
"facing=north,odd=false": { "model": "appliedenergistics2:QuartzTorch.wall" },
"facing=south,odd=false": { "model": "appliedenergistics2:QuartzTorch.wall", "y": 180 },
"facing=east,odd=false": { "model": "appliedenergistics2:QuartzTorch.wall", "y": 90 },
"facing=west,odd=false": { "model": "appliedenergistics2:QuartzTorch.wall", "y": 270 },
"facing=up,odd=true": { "model": "appliedenergistics2:QuartzTorch.standing.odd" },
"facing=down,odd=true": { "model": "appliedenergistics2:QuartzTorch.standing.odd", "x": 180 },
"facing=north,odd=true": { "model": "appliedenergistics2:QuartzTorch.wall.odd" },
"facing=south,odd=true": { "model": "appliedenergistics2:QuartzTorch.wall.odd", "y": 180 },
"facing=east,odd=true": { "model": "appliedenergistics2:QuartzTorch.wall.odd", "y": 90 },
"facing=west,odd=true": { "model": "appliedenergistics2:QuartzTorch.wall.odd", "y": 270 }
}
}
src/main/resources/assets/appliedenergistics2/models/block/QuartzTorch.standing.json
+125
View File
@@ -0,0 +1,125 @@
{
"textures": {
"quartz": "appliedenergistics2:blocks/BlockQuartzTorch",
"metal": "appliedenergistics2:blocks/BlockQuartzTorchMetal"
},
"elements": [
{
"name": "Middle Plate",
"from": [ 6.0, 3.0, 6.0 ],
"to": [ 10.0, 4.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Lower Quartz Block",
"from": [ 7.0, 1.0, 7.0 ],
"to": [ 9.0, 3.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Lower Quartz Tip",
"from": [ 7.0, 0.0, 7.0 ],
"to": [ 8.0, 1.0, 8.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Block",
"from": [ 7.0, 4.0, 7.0 ],
"to": [ 9.0, 6.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Tip",
"from": [ 8.0, 6.0, 8.0 ],
"to": [ 9.0, 7.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "NW Feet",
"from": [ 6.0, 0.0, 6.0 ],
"to": [ 7.0, 3.0, 7.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "NE Feet",
"from": [ 6.0, 0.0, 9.0 ],
"to": [ 7.0, 3.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "SW Feet",
"from": [ 9.0, 0.0, 6.0 ],
"to": [ 10.0, 3.0, 7.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "SE Feet",
"from": [ 9.0, 0.0, 9.0 ],
"to": [ 10.0, 3.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/QuartzTorch.standing.odd.json
+125
View File
@@ -0,0 +1,125 @@
{
"textures": {
"quartz": "appliedenergistics2:blocks/BlockQuartzTorch",
"metal": "appliedenergistics2:blocks/BlockQuartzTorchMetal"
},
"elements": [
{
"name": "Middle Plate",
"from": [ 6.0, 3.0, 6.0 ],
"to": [ 10.0, 4.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Lower Quartz Block",
"from": [ 7.0, 1.0, 7.0 ],
"to": [ 9.0, 3.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Lower Quartz Tip",
"from": [ 8.0, 0.0, 8.0 ],
"to": [ 9.0, 1.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Block",
"from": [ 7.0, 4.0, 7.0 ],
"to": [ 9.0, 6.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Tip",
"from": [ 7.0, 6.0, 7.0 ],
"to": [ 8.0, 7.0, 8.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "NW Feet",
"from": [ 6.0, 0.0, 6.0 ],
"to": [ 7.0, 3.0, 7.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "NE Feet",
"from": [ 6.0, 0.0, 9.0 ],
"to": [ 7.0, 3.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "SW Feet",
"from": [ 9.0, 0.0, 6.0 ],
"to": [ 10.0, 3.0, 7.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "SE Feet",
"from": [ 9.0, 0.0, 9.0 ],
"to": [ 10.0, 3.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/QuartzTorch.wall.json
+87
View File
@@ -0,0 +1,87 @@
{
"ambientocclusion": false,
"textures": {
"quartz": "appliedenergistics2:blocks/BlockQuartzTorch",
"metal": "appliedenergistics2:blocks/BlockQuartzTorchMetal"
},
"elements": [
{
"name": "Connecting Strut",
"from": [ 7.0, 7.0, 14.0 ],
"to": [ 8.0, 8.0, 16.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Middle Plate",
"from": [ 6.0, 7.0, 10.0 ],
"to": [ 10.0, 8.0, 14.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Lower Quartz Block",
"from": [ 7.0, 5.0, 11.0 ],
"to": [ 9.0, 7.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Lower Quartz Tip",
"from": [ 7.0, 4.0, 11.0 ],
"to": [ 8.0, 5.0, 12.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Block",
"from": [ 7.0, 8.0, 11.0 ],
"to": [ 9.0, 10.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Tip",
"from": [ 8.0, 10.0, 12.0 ],
"to": [ 9.0, 11.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/QuartzTorch.wall.odd.json
+87
View File
@@ -0,0 +1,87 @@
{
"ambientocclusion": false,
"textures": {
"quartz": "appliedenergistics2:blocks/BlockQuartzTorch",
"metal": "appliedenergistics2:blocks/BlockQuartzTorchMetal"
},
"elements": [
{
"name": "Connecting Strut",
"from": [ 7.0, 7.0, 14.0 ],
"to": [ 8.0, 8.0, 16.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Middle Plate",
"from": [ 6.0, 7.0, 10.0 ],
"to": [ 10.0, 8.0, 14.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Lower Quartz Block",
"from": [ 7.0, 5.0, 11.0 ],
"to": [ 9.0, 7.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Lower Quartz Tip",
"from": [ 8.0, 4.0, 12.0 ],
"to": [ 9.0, 5.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Block",
"from": [ 7.0, 8.0, 11.0 ],
"to": [ 9.0, 10.0, 13.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Tip",
"from": [ 7.0, 10.0, 11.0 ],
"to": [ 8.0, 11.0, 12.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/item/BlockQuartzTorch.json
+74
View File
@@ -0,0 +1,74 @@
{
"parent": "block/block",
"textures": {
"quartz": "appliedenergistics2:blocks/BlockQuartzTorch",
"metal": "appliedenergistics2:blocks/BlockQuartzTorchMetal"
},
"elements": [
{
"name": "Middle Plate",
"from": [ 6.0, 8.0, 6.0 ],
"to": [ 10.0, 9.0, 10.0 ],
"faces": {
"north": { "texture": "#metal" },
"east": { "texture": "#metal" },
"south": { "texture": "#metal" },
"west": { "texture": "#metal" },
"up": { "texture": "#metal" },
"down": { "texture": "#metal" }
}
},
{
"name": "Lower Quartz Block",
"from": [ 7.0, 6.0, 7.0 ],
"to": [ 9.0, 8.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Lower Quartz Tip",
"from": [ 8.0, 5.0, 7.0 ],
"to": [ 9.0, 6.0, 8.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Block",
"from": [ 7.0, 9.0, 7.0 ],
"to": [ 9.0, 11.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
},
{
"name": "Upper Quartz Tip",
"from": [ 7.0, 11.0, 8.0 ],
"to": [ 8.0, 12.0, 9.0 ],
"faces": {
"north": { "texture": "#quartz" },
"east": { "texture": "#quartz" },
"south": { "texture": "#quartz" },
"west": { "texture": "#quartz" },
"up": { "texture": "#quartz" },
"down": { "texture": "#quartz" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzTorch.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 824 B

src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzTorchMetal.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 622 B