[BUG] Fix model scaling for held and dropped - #1

Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json

@@ -198,8 +198,8 @@
 			"scale": [0.68, 0.68, 0.68]
 		},
 		"ground": {
-			"translation": [0, 2, 0],
+			"translation": [0, 3, 0],
-			"scale": [0.5, 0.5, 0.5]
+			"scale": [0.25, 0.25, 0.25]
 		},
 		"fixed": {
 			"rotation": [0, 180, 0]

Common/src/main/resources/assets/hyperlighting/models/block/campfire_base.json

@@ -96,5 +96,29 @@
 				"down": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#2"}
 			}
 		}
-	]
+	],
-}
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	}
+}

Common/src/main/resources/assets/hyperlighting/models/block/campfire_base_unlit.json

@@ -68,5 +68,29 @@
 				"down": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#1"}
 			}
 		}
-	]
+	],
-}
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	}
+}

Common/src/main/resources/assets/hyperlighting/models/block/lantern_basic.json

@@ -2,11 +2,11 @@
 	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "hyperlighting:block/grayscale_glass",
-		"2": "block/anvil",
+		"2": "minecraft:block/anvil",
-		"3": "block/anvil_top",
+		"3": "minecraft:block/anvil_top",
-		"5": "block/coal_block",
+		"5": "minecraft:block/coal_block",
-		"6": "block/candle",
+		"6": "minecraft:block/candle",
-		"particle": "block/coal_block"
+		"particle": "minecraft:block/coal_block"
 	},
 	"elements": [
 		{
@@ -313,6 +313,30 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	},
 	"groups": [
 		{
 			"name": "lantern",
@@ -352,4 +376,4 @@
 			]
 		}
 	]
-}
+}

Common/src/main/resources/assets/hyperlighting/models/block/lantern_basic_ceiling.json

@@ -2,11 +2,11 @@
 	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "hyperlighting:block/grayscale_glass",
-		"2": "block/anvil",
+		"2": "minecraft:block/anvil",
-		"3": "block/anvil_top",
+		"3": "minecraft:block/anvil_top",
-		"5": "block/coal_block",
+		"5": "minecraft:block/coal_block",
-		"6": "block/candle",
+		"6": "minecraft:block/candle",
-		"particle": "block/coal_block"
+		"particle": "minecraft:block/coal_block"
 	},
 	"elements": [
 		{
@@ -313,6 +313,30 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	},
 	"groups": [
 		{
 			"name": "lantern",
@@ -352,4 +376,4 @@
 			]
 		}
 	]
-}
+}

Common/src/main/resources/assets/hyperlighting/models/block/solar_neon.json

@@ -46,10 +46,33 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	},
 	"groups": [
 		{
 			"name": "group",
 			"origin": [10, 9, 15],
+			"color": 0,
 			"children": [0, 1, 2]
 		}
 	]

Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json

@@ -35,7 +35,8 @@
 			"rotation": [56, 0, 0]
 		},
 		"ground": {
-			"translation": [0, 5.5, 0]
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
 		},
 		"gui": {
 			"rotation": [90, 0, 0]

Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json

@@ -31,5 +31,29 @@
 				"down": {"uv": [7, 14, 9, 16], "texture": "#1"}
 			}
 		}
-	]
+	],
-}
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	}
+}