Merge remote-tracking branch 'origin/master' into master

src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json

@@ -1,4 +1,8 @@
 {
+	"loader": "forge:separate_transforms",
+	"gui_light": "front",
+	"base":
+	{
 		"textures": {
 			"0": "overdrive_that_matters:item/energy_sword",
 			"1": "overdrive_that_matters:item/energy_sword_charge"
@@ -307,19 +311,18 @@
 			"firstperson_lefthand": {
 				"rotation": [20, 0, 0],
 				"translation": [0, 1.75, -4.25]
+			}
+		}
 	},
-		"ground": {
-			"rotation": [13, 0, 0],
-			"translation": [0, 5, -2.25]
-		},
+	"perspectives": {
 		"gui": {
-			"rotation": [90, 42, -90],
-			"translation": [-4.75, -2.25, 0],
-			"scale": [0.8, 0.8, 0.8]
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
 		},
 		"fixed": {
-			"rotation": [90, -45, 90],
-			"translation": [5.5, -3.5, -1]
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
+		},
+		"ground": {
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
 		}
 	}
 }

src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_inventory.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "overdrive_that_matters:item/swordicon"
+	}
+}

src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json

@@ -1,24 +0,0 @@
-{
-	"loader": "forge:separate-perspective",
-	"gui_light": "front",
-	"base": {
-		"parent": "minecraft:item/handheld",
-		"textures": {
-			"layer0": "overdrive_that_matters:item/swordicon"
-		}
-	},
-	"perspectives": {
-		"third_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"third_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"first_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"first_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		}
-	}
-}