Fixes #3288: Fixes various item rotations when held in 3rd person.

AppliedEnergistics · Jan 14, 2018 · 13573bf · 13573bf
1 parent cbfc88c
commit 13573bf
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {
-    "parent": "item/generated",
+    "parent": "item/handheld",
     "textures": {
         "layer0": "appliedenergistics2:items/nether_quartz_sword"
     }