From 13573bf5260737ae6d237096af689c91af64c873 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 14 Jan 2018 14:22:43 +0100 Subject: [PATCH] Fixes #3288: Fixes various item rotations when held in 3rd person. --- .../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 e93f928ca47..f77d6c7dc27 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 d91bd8df757..87a3ac04ee1 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 6b6050cde6f..c737bd57f74 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 1b18ab4e62e..deb0bcab620 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 40ca507ce64..41f08decb0f 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 1caec3b4279..2309aa3fe62 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 f30c577f9d2..e68fbf5953b 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 29991c0eb24..e49839bedf8 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 cb5ca3d7df7..12f8f5221a9 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 7d6e5157840..96c75b40f7f 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 7584ca45b88..c799fc6f549 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 db68ef30f92..9f8d17ec994 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 a2f26c380c5..c3640be5b66 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" }