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

Fixes broken controller rendering.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-26 16:55:01 +02:00
parent 96a9e2f558
commit 9fe692c9bd
10 changed files with 121 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/controller.json
+70 -7
View File
@@ -11,7 +11,7 @@
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_block_online.uvl"
"model": "appliedenergistics2:controller/controller_block_online"
},
"when": {
"state": "online",
@@ -20,38 +20,101 @@
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_block_conflicted.uvl"
"model": "appliedenergistics2:controller/controller_block_conflicted"
},
"when": {
"state": "conflicted",
"type": "block"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_offline",
"x": 90,
"y": 90
},
"when": {
"state": "offline",
"type": "column_x"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_offline"
},
"when": {
"state": "offline",
"type": "column"
"type": "column_y"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_online.uvl"
"model": "appliedenergistics2:controller/controller_column_offline",
"x": 90
},
"when": {
"state": "offline",
"type": "column_z"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_online",
"x": 90,
"y": 90
},
"when": {
"state": "online",
"type": "column"
"type": "column_x"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_conflicted.uvl"
"model": "appliedenergistics2:controller/controller_column_online"
},
"when": {
"state": "online",
"type": "column_y"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_online",
"x": 90
},
"when": {
"state": "online",
"type": "column_z"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_conflicted",
"x": 90,
"y": 90
},
"when": {
"state": "conflicted",
"type": "column"
"type": "column_x"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_conflicted"
},
"when": {
"state": "conflicted",
"type": "column_y"
}
},
{
"apply": {
"model": "appliedenergistics2:controller/controller_column_conflicted",
"x": 90
},
"when": {
"state": "conflicted",
"type": "column_z"
}
},
{
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json → src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json
+1 -19
View File
@@ -1,23 +1,5 @@
{
"display": {
"firstperson_righthand": {
"rotation": [
0,
135,
0
],
"scale": [
0.40,
0.40,
0.40
],
"translation": [
0,
0,
0
]
}
},
"uvlMarker": true,
"elements": [
{
"faces": {
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json → src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json
+1 -19
View File
@@ -1,23 +1,5 @@
{
"display": {
"firstperson_righthand": {
"rotation": [
0,
135,
0
],
"scale": [
0.40,
0.40,
0.40
],
"translation": [
0,
0,
0
]
}
},
"uvlMarker": true,
"elements": [
{
"faces": {
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json → src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json
+1 -19
View File
@@ -1,23 +1,5 @@
{
"display": {
"firstperson_righthand": {
"rotation": [
0,
135,
0
],
"scale": [
0.40,
0.40,
0.40
],
"translation": [
0,
0,
0
]
}
},
"uvlMarker": true,
"elements": [
{
"faces": {
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json
+3 -2
View File
@@ -1,6 +1,7 @@
{
"parent": "block/cube_all",
"parent": "block/cube_column",
"textures": {
"all": "appliedenergistics2:blocks/controller_column"
"side": "appliedenergistics2:blocks/controller_column",
"end": "appliedenergistics2:blocks/controller"
}
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json → src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json
+1 -19
View File
@@ -1,23 +1,5 @@
{
"display": {
"firstperson_righthand": {
"rotation": [
0,
135,
0
],
"scale": [
0.40,
0.40,
0.40
],
"translation": [
0,
0,
0
]
}
},
"uvlMarker": true,
"elements": [
{
"faces": {
src/main/resources/assets/appliedenergistics2/models/item/controller.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/controller/controller_block_offline"
}