From f0e45c7a3ca9fa116ce5863b1a476bdce334ca87 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 14 Jan 2018 14:36:04 +0100 Subject: [PATCH] Fixes #3288: Fixes various item rotations when held in 3rd person. (#3330) --- .../models/item/certus_quartz_axe.json | 2 +- .../models/item/certus_quartz_hoe.json | 2 +- .../models/item/certus_quartz_pickaxe.json | 2 +- .../models/item/certus_quartz_spade.json | 2 +- .../models/item/certus_quartz_sword.json | 2 +- .../models/item/charged_staff.json | 2 +- .../models/item/entropy_manipulator.json | 2 +- .../models/item/matter_cannon.json | 18 +++++++++++++++++- .../models/item/nether_quartz_axe.json | 2 +- .../models/item/nether_quartz_hoe.json | 2 +- .../models/item/nether_quartz_pickaxe.json | 2 +- .../models/item/nether_quartz_spade.json | 2 +- .../models/item/nether_quartz_sword.json | 2 +- 13 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json index e93f928ca..f77d6c7dc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/certus_quartz_axe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json index d91bd8df7..87a3ac04e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/certus_quartz_hoe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json index 6b6050cde..c737bd57f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/certus_quartz_pickaxe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json index 1b18ab4e6..deb0bcab6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/certus_quartz_spade" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json index 40ca507ce..41f08decb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/certus_quartz_sword" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json index 1caec3b42..2309aa3fe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/charged_staff" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json b/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json index f30c577f9..e68fbf595 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/entropy_manipulator" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json b/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json index 29991c0eb..e49839bed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json @@ -1,6 +1,22 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/matter_cannon" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 0, + -90, + 0 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 0, + 90, + 0 + ] + } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json index cb5ca3d7d..12f8f5221 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/nether_quartz_axe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json index 7d6e51578..96c75b40f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/nether_quartz_hoe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json index 7584ca45b..c799fc6f5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/nether_quartz_pickaxe" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json index db68ef30f..9f8d17ec9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/nether_quartz_spade" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json index a2f26c380..c3640be5b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "appliedenergistics2:items/nether_quartz_sword" }