mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-25 14:43:22 +00:00
Code Issues Releases Wiki Activity

Merge pull request #168 from SquidDev-CC/hotfix/modem-model-rotation

Browse Source 
Various model improvements
This commit is contained in:
Daniel Ratcliffe 2017-05-04 21:08:51 +01:00 committed by GitHub
commit fa99305914
17 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/resources/assets/computercraft/models/block/modem.json
View File

@ -16,5 +16,37 @@
"east": { "uv": [ 13, 2, 16, 14 ], "texture": "#front" }
}
}
]
],
"display": {
"gui": {
"rotation": [ 30, 45, 0 ],
"translation": [ 3.2, -2, 0],
"scale":[ 0.75, 0.75, 0.75 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
"rotation": [ 75, 180, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 45, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 45, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
}
}

2
src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerBlinkAdvanced"
}

2
src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking_modem_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerBlinkAdvanced",
"layer1": "computercraft:items/pocketComputerModemLight"

2
src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerAdvanced"
}

2
src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerOnAdvanced"
}

2
src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on_modem_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerOnAdvanced",
"layer1": "computercraft:items/pocketComputerModemLight"

2
src/main/resources/assets/computercraft/models/item/book.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/book"
}

2
src/main/resources/assets/computercraft/models/item/disk.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/diskFrame",
"layer1": "computercraft:items/diskColour"

2
src/main/resources/assets/computercraft/models/item/diskExpanded.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/diskFrame",
"layer1": "computercraft:items/diskColour"

2
src/main/resources/assets/computercraft/models/item/pages.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pageBundle"
}

2
src/main/resources/assets/computercraft/models/item/pocketComputer.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputer"
}

2
src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerBlink"
}

2
src/main/resources/assets/computercraft/models/item/pocket_computer_blinking_modem_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerBlink",
"layer1": "computercraft:items/pocketComputerModemLight"

2
src/main/resources/assets/computercraft/models/item/pocket_computer_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerOn"
}

2
src/main/resources/assets/computercraft/models/item/pocket_computer_on_modem_on.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/pocketComputerOn",
"layer1": "computercraft:items/pocketComputerModemLight"

2
src/main/resources/assets/computercraft/models/item/printout.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/page"
}

2
src/main/resources/assets/computercraft/models/item/treasureDisk.json
View File

@ -1,5 +1,5 @@
{
"parent": "builtin/generated",
"parent": "item/generated",
"textures": {
"layer0": "computercraft:items/diskFrame",
"layer1": "computercraft:items/diskColour"