From 217d7e1a4480603d90972c992d776c9517751dd8 Mon Sep 17 00:00:00 2001 From: Dimmerworld Date: Tue, 13 Feb 2018 01:18:33 +1100 Subject: [PATCH] Display(in hand) adjustments for Alarm, Led, and led2 (#1439) --- .../blockstates/machines/lighting/alarm.json | 3 +-- .../machines/lighting/lamp_incandescent.json | 3 +-- .../machines/lighting/lamp_led.json | 3 +-- .../assets/techreborn/models/block/alarm.json | 18 ++++++++++++++++++ .../models/block/lamp_incandescent.json | 18 ++++++++++++++++++ .../techreborn/models/block/lamp_led.json | 18 ++++++++++++++++++ 6 files changed, 57 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json index b3133f448..9be6d3625 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json @@ -1,7 +1,7 @@ { "forge_marker": 1, - "defaults": { "transform": "forge:default-block", + "defaults": { "model": "techreborn:alarm", "textures": { "particle": "#alarm" @@ -9,7 +9,6 @@ }, "variants": { "inventory": { - "transform": "forge:default-block", "model": "techreborn:alarm", "textures": { "alarm": "techreborn:blocks/machines/lighting/alarm_off" diff --git a/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_incandescent.json b/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_incandescent.json index 135be13e4..e7819b1db 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_incandescent.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_incandescent.json @@ -1,7 +1,7 @@ { "forge_marker": 1, + "transform": "forge:default-block", "defaults": { - "transform": "forge:default-block", "model": "techreborn:lamp_incandescent", "textures": { "particle": "#lamp" @@ -9,7 +9,6 @@ }, "variants": { "inventory": { - "transform": "forge:default-block", "model": "techreborn:lamp_incandescent", "textures": { "lamp": "techreborn:blocks/machines/lighting/lamp" diff --git a/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_led.json b/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_led.json index 363aca230..e026c66c1 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_led.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/lighting/lamp_led.json @@ -1,7 +1,7 @@ { "forge_marker": 1, + "transform": "forge:default-block", "defaults": { - "transform": "forge:default-block", "model": "techreborn:lamp_led", "textures": { "particle": "#lamp" @@ -9,7 +9,6 @@ }, "variants": { "inventory": { - "transform": "forge:default-block", "model": "techreborn:lamp_led", "textures": { "lamp": "techreborn:blocks/machines/lighting/lamp" diff --git a/src/main/resources/assets/techreborn/models/block/alarm.json b/src/main/resources/assets/techreborn/models/block/alarm.json index a2badfbd8..b7164f99d 100644 --- a/src/main/resources/assets/techreborn/models/block/alarm.json +++ b/src/main/resources/assets/techreborn/models/block/alarm.json @@ -1,4 +1,22 @@ { + "parent": "block/block", + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 2], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 35, 0 ], + "translation": [ 0, 5.5, 0 ], + "scale": [ 0.60, 0.60, 0.60 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 4.2, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + }, "textures": { "0": "#alarm" }, diff --git a/src/main/resources/assets/techreborn/models/block/lamp_incandescent.json b/src/main/resources/assets/techreborn/models/block/lamp_incandescent.json index b2ec82714..633021fbf 100644 --- a/src/main/resources/assets/techreborn/models/block/lamp_incandescent.json +++ b/src/main/resources/assets/techreborn/models/block/lamp_incandescent.json @@ -1,4 +1,22 @@ { + "parent": "block/block", + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 2], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 35, 0 ], + "translation": [ 0, 4.3, 0 ], + "scale": [ 0.60, 0.60, 0.60 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 4.2, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + }, "textures": { "0": "#lamp" }, diff --git a/src/main/resources/assets/techreborn/models/block/lamp_led.json b/src/main/resources/assets/techreborn/models/block/lamp_led.json index 51b6f4970..a5c0c66bf 100644 --- a/src/main/resources/assets/techreborn/models/block/lamp_led.json +++ b/src/main/resources/assets/techreborn/models/block/lamp_led.json @@ -1,4 +1,22 @@ { + "parent": "block/block", + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 2], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 35, 0 ], + "translation": [ 0, 5.5, 0 ], + "scale": [ 0.60, 0.60, 0.60 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 4.2, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + }, "textures": { "0": "#lamp" },