Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Tweaked empowerer & display stand models.

Browse source
This commit is contained in:
BootyToast 2016-08-14 03:44:50 -04:00
parent ba4f4252e0
commit 230c5a8743
5 changed files with 261 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json
View file

@ -149,6 +149,127 @@
"up": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, "up": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } "down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
} }
},
{
"name": "Cube",
"from": [ 6.0, 8.0, 6.0 ],
"to": [ 10.0, 9.0, 10.0 ],
"faces": {
"north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 7.0 ], "rotation": 180 },
"east": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] },
"south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] },
"west": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 10.0 ], "rotation": 270 },
"up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }
}
},
{
"name": "Cube",
"from": [ 4.0, 8.0, 6.0 ],
"to": [ 6.0, 9.0, 10.0 ],
"rotation": { "origin": [ 6.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 },
"faces": {
"north": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] },
"east": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 },
"south": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] },
"west": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 },
"up": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] },
"down": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] }
}
},
{
"name": "Cube",
"from": [ 10.0, 8.0, 6.0 ],
"to": [ 12.0, 9.0, 10.0 ],
"rotation": { "origin": [ 10.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 },
"faces": {
"north": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] },
"east": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 },
"south": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] },
"west": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 },
"up": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] },
"down": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] }
}
},
{
"name": "Cube",
"from": [ 6.0, 8.0, 10.0 ],
"to": [ 10.0, 9.0, 12.0 ],
"rotation": { "origin": [ 8.0, 9.0, 10.0 ], "axis": "x", "angle": 45.0 },
"faces": {
"north": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
"east": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] },
"south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
"west": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] },
"up": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] },
"down": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] }
}
},
{
"name": "Cube",
"from": [ 6.0, 8.0, 4.0 ],
"to": [ 10.0, 9.0, 6.0 ],
"rotation": { "origin": [ 8.0, 9.0, 6.0 ], "axis": "x", "angle": -45.0 },
"faces": {
"north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
"east": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] },
"south": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
"west": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] },
"up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] },
"down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] }
}
},
{
"name": "Cube",
"from": [ 0.0, 6.0, 0.0 ],
"to": [ 1.0, 9.0, 1.0 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 15.0, 6.0, 0.0 ],
"to": [ 16.0, 9.0, 1.0 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 15.0, 6.0, 15.0 ],
"to": [ 16.0, 9.0, 16.0 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 0.0, 6.0, 15.0 ],
"to": [ 1.0, 9.0, 16.0 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
} }
] ]
} }

160
src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json
View file

@ -3,8 +3,7 @@
"textures": { "textures": {
"0": "actuallyadditions:blocks/blockCoalGeneratorSide", "0": "actuallyadditions:blocks/blockCoalGeneratorSide",
"1": "actuallyadditions:blocks/blockMiscIronCasing", "1": "actuallyadditions:blocks/blockMiscIronCasing",
"2": "actuallyadditions:blocks/blockAtomicReconstructorTop", "2": "actuallyadditions:blocks/blockEmpowerer"
"3": "actuallyadditions:blocks/blockEmpowerer"
}, },
"elements": [ "elements": [
{ {
@ -90,12 +89,12 @@
"from": [ 2.0, 6.0, 0.0 ], "from": [ 2.0, 6.0, 0.0 ],
"to": [ 14.0, 7.0, 16.0 ], "to": [ 14.0, 7.0, 16.0 ],
"faces": { "faces": {
"north": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
"east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
"south": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
"west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
"up": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, "up": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
"down": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] } "down": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }
} }
}, },
{ {
@ -103,12 +102,12 @@
"from": [ 0.0, 6.0, 2.0 ], "from": [ 0.0, 6.0, 2.0 ],
"to": [ 16.0, 7.0, 14.0 ], "to": [ 16.0, 7.0, 14.0 ],
"faces": { "faces": {
"north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
"east": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, "east": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
"south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
"west": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, "west": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
"up": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }, "up": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] },
"down": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] } "down": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }
} }
}, },
{ {
@ -116,12 +115,12 @@
"from": [ 1.0, 7.0, 1.0 ], "from": [ 1.0, 7.0, 1.0 ],
"to": [ 15.0, 8.0, 15.0 ], "to": [ 15.0, 8.0, 15.0 ],
"faces": { "faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
"east": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, "east": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
"south": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, "south": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
"west": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, "west": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] },
"up": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] },
"down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }
} }
}, },
{ {
@ -175,6 +174,127 @@
"up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
"down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] } "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
} }
},
{
"name": "Cube",
"from": [ 3.0, 8.0, 5.0 ],
"to": [ 5.0, 9.0, 11.0 ],
"rotation": { "origin": [ 5.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 },
"faces": {
"north": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 10.0, 7.0, 11.0, 8.0 ] },
"west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 5.0, 7.0, 6.0, 13.0 ], "rotation": 180 },
"down": { "texture": "#1", "uv": [ 5.0, 3.0, 11.0, 4.0 ] }
}
},
{
"name": "Cube",
"from": [ 11.0, 8.0, 5.0 ],
"to": [ 13.0, 9.0, 11.0 ],
"rotation": { "origin": [ 11.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 },
"faces": {
"north": { "texture": "#1", "uv": [ 4.0, 8.0, 5.0, 9.0 ] },
"east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 11.0, 7.0, 12.0, 8.0 ] },
"west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 4.0, 5.0, 5.0, 11.0 ], "rotation": 180 },
"down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 90 }
}
},
{
"name": "Cube",
"from": [ 5.0, 8.0, 3.0 ],
"to": [ 11.0, 9.0, 5.0 ],
"rotation": { "origin": [ 8.0, 9.0, 5.0 ], "axis": "x", "angle": -45.0 },
"faces": {
"north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"west": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 5.0, 8.0, 11.0 ],
"to": [ 11.0, 9.0, 13.0 ],
"rotation": { "origin": [ 8.0, 9.0, 11.0 ], "axis": "x", "angle": 45.0 },
"faces": {
"north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"west": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 5.0, 8.0, 5.0 ],
"to": [ 11.0, 9.0, 11.0 ],
"faces": {
"north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 4.0, 6.0, 5.0, 12.0 ], "rotation": 90 },
"south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 180 },
"west": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 9.0 ], "rotation": 90 },
"up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] },
"down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] }
}
},
{
"name": "Cube",
"from": [ 0.0, 6.0, 0.0 ],
"to": [ 1.0, 9.0, 1.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 15.0, 6.0, 0.0 ],
"to": [ 16.0, 9.0, 1.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 15.0, 6.0, 15.0 ],
"to": [ 16.0, 9.0, 16.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
}
},
{
"name": "Cube",
"from": [ 0.0, 6.0, 15.0 ],
"to": [ 1.0, 9.0, 16.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] },
"down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }
}
} }
] ]
} }

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3 KiB