diff --git a/assets/minecraft/items/iron_ingot.json b/assets/minecraft/items/iron_ingot.json index 36597a58..1f24c0fe 100644 --- a/assets/minecraft/items/iron_ingot.json +++ b/assets/minecraft/items/iron_ingot.json @@ -1085,6 +1085,13 @@ "model": "item/trainmodel/lipan/lili_emd_htc/lili_emd_htc" } }, + { + "threshold": 2029, + "model": { + "type": "model", + "model": "item/trainmodel/lipan/lili_utility/eot_signal" + } + }, { "threshold": 1125, "model": { diff --git a/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_body.json b/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_body.json index 879cad48..3ab36cc6 100644 --- a/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_body.json +++ b/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_body.json @@ -761,6 +761,84 @@ "down": {"uv": [14, 0, 16, 16], "texture": "#11"} } }, + { + "from": [12.125, 5.75, 26.5625], + "to": [12.25, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8.875, 22.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#3"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#3"} + } + }, + { + "from": [12.25, 5.75, 26.5], + "to": [12.375, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.125, 8.875, 23.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#3"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#3"} + } + }, + { + "from": [12, 5.75, 26.5], + "to": [12.125, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [8.875, 8.875, 23.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#3"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#3"} + } + }, + { + "from": [3.75, 5.75, 26.5625], + "to": [3.875, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8.875, 22.9375]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#3"}, + "down": {"uv": [16, 16, 0, 0], "texture": "#3"} + } + }, + { + "from": [3.625, 5.75, 26.5], + "to": [3.75, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.875, 8.875, 23.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#3"}, + "down": {"uv": [16, 16, 0, 0], "texture": "#3"} + } + }, + { + "from": [3.875, 5.75, 26.5], + "to": [4, 5.875, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [7.125, 8.875, 23.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#3"}, + "down": {"uv": [16, 16, 0, 0], "texture": "#3"} + } + }, { "from": [2.5, 3.875, -10.5], "to": [3.25, 5.125, -10], @@ -1190,6 +1268,84 @@ "down": {"uv": [14, 16, 16, 0], "texture": "#11"} } }, + { + "from": [12.125, 5.75, -10.625], + "to": [12.25, 5.875, -10.5625], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8.875, -6.9375]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [12.25, 5.75, -10.625], + "to": [12.375, 5.875, -10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9.125, 8.875, -7.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [12, 5.75, -10.625], + "to": [12.125, 5.875, -10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.875, 8.875, -7.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [3.75, 5.75, -10.625], + "to": [3.875, 5.875, -10.5625], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8.875, -6.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#3"} + } + }, + { + "from": [3.625, 5.75, -10.625], + "to": [3.75, 5.875, -10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6.875, 8.875, -7.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#3"} + } + }, + { + "from": [3.875, 5.75, -10.625], + "to": [4, 5.875, -10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.125, 8.875, -7.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#3"} + } + }, { "from": [2.5, 5.875, 11.5], "to": [2.75, 14.625, 19.5], @@ -4561,6 +4717,18 @@ "children": [54, 55, 56] } ] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [57, 58, 59] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [60, 61, 62] } ] }, @@ -4569,21 +4737,21 @@ "origin": [-14.6, -11, -14], "color": 0, "children": [ - 57, + 63, { "name": "HEP", "origin": [2.4, 5.1, -3.8], "color": 0, - "children": [58, 59] + "children": [64, 65] }, - 60, - 61, - 62, - 63, - 64, - 65, 66, 67, + 68, + 69, + 70, + 71, + 72, + 73, { "name": "Coupler", "origin": [10.28, 8, 8], @@ -4593,13 +4761,13 @@ "name": "BufferL", "origin": [17.4, -11, -14], "color": 0, - "children": [68, 69, 70, 71, 72] + "children": [74, 75, 76, 77, 78] }, { "name": "BufferR", "origin": [-14.6, -11, -14], "color": 0, - "children": [73, 74, 75, 76, 77] + "children": [79, 80, 81, 82, 83] } ] }, @@ -4612,27 +4780,39 @@ "name": "AirPipe", "origin": [2.2, 2.4, 7.7], "color": 0, - "children": [78, 79, 80] + "children": [84, 85, 86] }, { "name": "AirPipe", "origin": [2.2, 2.4, 7.7], "color": 0, - "children": [81, 82, 83] + "children": [87, 88, 89] }, { "name": "AirPipe", "origin": [2.2, 2.4, 7.7], "color": 0, - "children": [84, 85, 86] + "children": [90, 91, 92] }, { "name": "AirPipe", "origin": [2.2, 2.4, 7.7], "color": 0, - "children": [87, 88, 89] + "children": [93, 94, 95] } ] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [96, 97, 98] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [99, 100, 101] } ] }, @@ -4645,7 +4825,7 @@ "name": "Sides", "origin": [6.4, 6.1, -5.2], "color": 0, - "children": [90, 91, 92, 93, 94, 95] + "children": [102, 103, 104, 105, 106, 107] }, { "name": "Roof", @@ -4656,10 +4836,10 @@ "name": "Pit", "origin": [0.4, 0, 0], "color": 0, - "children": [96, 97, 98] + "children": [108, 109, 110] }, - 99, - 100 + 111, + 112 ] }, { @@ -4667,10 +4847,10 @@ "origin": [8.4, 8, 8], "color": 0, "children": [ - 101, - 102, - 103, - 104, + 113, + 114, + 115, + 116, { "name": "Fittings", "origin": [8, 3.9, -6.8], @@ -4680,54 +4860,54 @@ "name": "MURail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [105, 106, 107] + "children": [117, 118, 119] }, { "name": "Wiper", "origin": [7.5, 3.9, -6.8], "color": 0, - "children": [108, 109, 110, 111, 112, 113, 114] + "children": [120, 121, 122, 123, 124, 125, 126] }, { "name": "Wiper", "origin": [7.5, 3.9, -6.8], "color": 0, - "children": [115, 116, 117, 118, 119, 120, 121] + "children": [127, 128, 129, 130, 131, 132, 133] }, { "name": "Handrail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [122, 123, 124] + "children": [134, 135, 136] }, { "name": "Handrail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [125, 126, 127] + "children": [137, 138, 139] } ] }, - 128, - 129, - 130, - 131, - 132, - 133, - 134, - 135, - 136, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, { "name": "Right", "origin": [-0.6, -1, 2], "color": 0, - "children": [137, 138, 139, 140, 141, 142, 143] + "children": [149, 150, 151, 152, 153, 154, 155] }, { "name": "Left", "origin": [-0.6, -1, 2], "color": 0, - "children": [144, 145, 146, 147, 148, 149, 150] + "children": [156, 157, 158, 159, 160, 161, 162] } ] }, @@ -4736,10 +4916,10 @@ "origin": [8.4, 8, 8], "color": 0, "children": [ - 151, - 152, - 153, - 154, + 163, + 164, + 165, + 166, { "name": "Fittings", "origin": [8, 3.9, -6.8], @@ -4749,54 +4929,54 @@ "name": "MURail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [155, 156, 157] + "children": [167, 168, 169] }, { "name": "Wiper", "origin": [7.5, 3.9, -6.8], "color": 0, - "children": [158, 159, 160, 161, 162, 163, 164] + "children": [170, 171, 172, 173, 174, 175, 176] }, { "name": "Wiper", "origin": [7.5, 3.9, -6.8], "color": 0, - "children": [165, 166, 167, 168, 169, 170, 171] + "children": [177, 178, 179, 180, 181, 182, 183] }, { "name": "Handrail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [172, 173, 174] + "children": [184, 185, 186] }, { "name": "Handrail", "origin": [8, 3.9, -6.8], "color": 0, - "children": [175, 176, 177] + "children": [187, 188, 189] } ] }, - 178, - 179, - 180, - 181, - 182, - 183, - 184, - 185, - 186, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, { "name": "Right", "origin": [-0.6, -1, 2], "color": 0, - "children": [187, 188, 189, 190, 191, 192, 193] + "children": [199, 200, 201, 202, 203, 204, 205] }, { "name": "Left", "origin": [-0.6, -1, 2], "color": 0, - "children": [194, 195, 196, 197, 198, 199, 200] + "children": [206, 207, 208, 209, 210, 211, 212] } ] } @@ -4816,25 +4996,25 @@ "name": "Walls", "origin": [8, 8, 8], "color": 0, - "children": [201, 202] + "children": [213, 214] }, { "name": "ControlStand", "origin": [8, 8, 8], "color": 0, - "children": [203, 204, 205, 206, 207, 208, 209] + "children": [215, 216, 217, 218, 219, 220, 221] }, { "name": "Seat", "origin": [11.1, 8, 8], "color": 0, - "children": [210, 211, 212, 213, 214] + "children": [222, 223, 224, 225, 226] }, { "name": "Seat", "origin": [11.1, 8, 8], "color": 0, - "children": [215, 216, 217, 218, 219] + "children": [227, 228, 229, 230, 231] }, { "name": "Instruments", @@ -4845,48 +5025,48 @@ "name": "Phone", "origin": [8, 8, 8], "color": 0, - "children": [220, 221, 222] + "children": [232, 233, 234] }, { "name": "Controller", "origin": [8, 8, 8], "color": 0, - "children": [223, 224, 225, 226, 227] + "children": [235, 236, 237, 238, 239] }, { "name": "Reverser", "origin": [8, 8, 8], "color": 0, - "children": [228, 229, 230, 231] + "children": [240, 241, 242, 243] }, { "name": "LTC", "origin": [8, 8, 8], "color": 0, - "children": [232, 233] + "children": [244, 245] }, { "name": "Radio", "origin": [8, 8, 8], "color": 0, - "children": [234] + "children": [246] }, - 235, - 236, - 237 + 247, + 248, + 249 ] }, { "name": "BrakeLever", "origin": [3.3, 4.4, -4], "color": 0, - "children": [238, 239, 240] + "children": [250, 251, 252] }, { "name": "HornLever", "origin": [3.3, 4.4, -4], "color": 0, - "children": [241, 242] + "children": [253, 254] } ] }, @@ -4899,25 +5079,25 @@ "name": "Walls", "origin": [8, 8, 8], "color": 0, - "children": [243, 244] + "children": [255, 256] }, { "name": "ControlStand", "origin": [8, 8, 8], "color": 0, - "children": [245, 246, 247, 248, 249, 250, 251] + "children": [257, 258, 259, 260, 261, 262, 263] }, { "name": "Seat", "origin": [11.1, 8, 8], "color": 0, - "children": [252, 253, 254, 255, 256] + "children": [264, 265, 266, 267, 268] }, { "name": "Seat", "origin": [11.1, 8, 8], "color": 0, - "children": [257, 258, 259, 260, 261] + "children": [269, 270, 271, 272, 273] }, { "name": "Instruments", @@ -4928,48 +5108,48 @@ "name": "Phone", "origin": [8, 8, 8], "color": 0, - "children": [262, 263, 264] + "children": [274, 275, 276] }, { "name": "Controller", "origin": [8, 8, 8], "color": 0, - "children": [265, 266, 267, 268, 269] + "children": [277, 278, 279, 280, 281] }, { "name": "Reverser", "origin": [8, 8, 8], "color": 0, - "children": [270, 271, 272, 273] + "children": [282, 283, 284, 285] }, { "name": "LTC", "origin": [8, 8, 8], "color": 0, - "children": [274, 275] + "children": [286, 287] }, { "name": "Radio", "origin": [8, 8, 8], "color": 0, - "children": [276] + "children": [288] }, - 277, - 278, - 279 + 289, + 290, + 291 ] }, { "name": "BrakeLever", "origin": [3.3, 4.4, -4], "color": 0, - "children": [280, 281, 282] + "children": [292, 293, 294] }, { "name": "HornLever", "origin": [3.3, 4.4, -4], "color": 0, - "children": [283, 284] + "children": [295, 296] } ] }, @@ -4977,7 +5157,7 @@ "name": "MachineRoom", "origin": [8, 8, 8], "color": 0, - "children": [285, 286, 287, 288, 289, 290] + "children": [297, 298, 299, 300, 301, 302] } ] }, @@ -4985,19 +5165,19 @@ "name": "Door", "origin": [8, 8, 8], "color": 0, - "children": [291, 292, 293, 294] + "children": [303, 304, 305, 306] }, { "name": "Windows1", "origin": [7.8, 3.9, -6.8], "color": 0, - "children": [295, 296, 297, 298, 299, 300, 301] + "children": [307, 308, 309, 310, 311, 312, 313] }, { "name": "Windows2", "origin": [6.4, 6.1, 21.6], "color": 0, - "children": [302, 303, 304, 305, 306, 307, 308] + "children": [314, 315, 316, 317, 318, 319, 320] }, { "name": "DoorHandrails", @@ -5008,13 +5188,13 @@ "name": "Rails", "origin": [8, 8, 8], "color": 0, - "children": [309, 310, 311] + "children": [321, 322, 323] }, { "name": "Rails", "origin": [8, 8, 8], "color": 0, - "children": [312, 313, 314] + "children": [324, 325, 326] } ] }, @@ -5027,13 +5207,13 @@ "name": "Rails", "origin": [8, 8, 8], "color": 0, - "children": [315, 316, 317] + "children": [327, 328, 329] }, { "name": "Rails", "origin": [8, 8, 8], "color": 0, - "children": [318, 319, 320] + "children": [330, 331, 332] } ] }, @@ -5041,13 +5221,13 @@ "name": "Pantograph", "origin": [-6.6, -1.7, 11], "color": 0, - "children": [321, 322, 323, 324, 325, 326, 327, 328, 329] + "children": [333, 334, 335, 336, 337, 338, 339, 340, 341] }, { "name": "Pantograph", "origin": [-6.6, -1.7, 11], "color": 0, - "children": [330, 331, 332, 333, 334, 335, 336, 337, 338] + "children": [342, 343, 344, 345, 346, 347, 348, 349, 350] } ] } diff --git a/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_bogie.json b/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_bogie.json index b0bc12f3..17f5103c 100644 --- a/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_bogie.json +++ b/assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_bogie.json @@ -3524,6 +3524,32 @@ "down": {"uv": [0, 0, 16, 16], "texture": "#3"} } }, + { + "from": [7.625, 2.5625, -1], + "to": [8.375, 2.9375, -0.875], + "rotation": {"angle": 0, "axis": "y", "origin": [7.375, 2.5625, -1.5]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [8, 2.5625, -1.5], + "to": [8.125, 2.6875, -1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.375, 2.5625, -1.625]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, { "from": [7.3125, 3.0625, -1], "to": [7.625, 4.0625, -0.375], @@ -3642,7 +3668,7 @@ } }, { - "from": [8.125, 2.9375, -1.25], + "from": [8.125, 2.5625, -1.25], "to": [8.5, 4.1875, -1], "rotation": {"angle": 0, "axis": "y", "origin": [7.375, 2.9375, -2]}, "faces": { @@ -4134,10 +4160,10 @@ "children": [266, 267, 268] }, { - "name": "Knuckle-H", + "name": "Knuckle-F", "origin": [10.28, 8, 8], "color": 0, - "children": [269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280] + "children": [269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282] } ] } diff --git a/assets/minecraft/models/item/trainmodel/lipan/lili_bmf/lili_bmf_body.json b/assets/minecraft/models/item/trainmodel/lipan/lili_bmf/lili_bmf_body.json index 6d885cae..d6dfc60b 100644 --- a/assets/minecraft/models/item/trainmodel/lipan/lili_bmf/lili_bmf_body.json +++ b/assets/minecraft/models/item/trainmodel/lipan/lili_bmf/lili_bmf_body.json @@ -7,6 +7,7 @@ "1": "block/lipan/l500/l500_airpipe_main", "2": "block/lipan/lili/lili_black_rubber", "3": "block/lipan/lili/lilo_lipan_red", + "4": "block/lipan/lili/lilo_reservoir_yellow", "particle": "block/lipan/lili_multipurpose_flat/lili_multipurpose_flat_body_lipan" }, "elements": [ @@ -3949,6 +3950,84 @@ "down": {"uv": [8.70313, 6.375, 8.625, 6.4375], "texture": "#0"} } }, + { + "from": [12, 5, -10.375], + "to": [12.125, 5.125, -10.3125], + "rotation": {"angle": 0, "axis": "y", "origin": [15.25, 8.125, -6.6875]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, + { + "from": [11.875, 5, -10.375], + "to": [12, 5.125, -10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [15.125, 8.125, -7]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, + { + "from": [12.125, 5, -10.375], + "to": [12.25, 5.125, -10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [15.375, 8.125, -7]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, + { + "from": [6, 5, -10.625], + "to": [6.125, 5.125, -10.5625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.25, 8.125, -6.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, + { + "from": [5.875, 5, -10.625], + "to": [6, 5.125, -10.375], + "rotation": {"angle": 0, "axis": "y", "origin": [9.125, 8.125, -7.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, + { + "from": [6.125, 5, -10.625], + "to": [6.25, 5.125, -10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9.375, 8.125, -7.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#4"} + } + }, { "from": [2.5, 4.125, 26], "to": [13.5, 5.375, 26.25], @@ -4417,6 +4496,84 @@ "down": {"uv": [7.82813, 8.625, 7.75, 8.6875], "texture": "#0"} } }, + { + "from": [3.875, 5, 26.3125], + "to": [4, 5.125, 26.375], + "rotation": {"angle": 0, "axis": "y", "origin": [0.75, 8.125, 22.6875]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, + { + "from": [4, 5, 26.25], + "to": [4.125, 5.125, 26.375], + "rotation": {"angle": 0, "axis": "y", "origin": [0.875, 8.125, 23]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, + { + "from": [3.75, 5, 26.25], + "to": [3.875, 5.125, 26.375], + "rotation": {"angle": 0, "axis": "y", "origin": [0.625, 8.125, 23]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, + { + "from": [9.875, 5, 26.5625], + "to": [10, 5.125, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.75, 8.125, 22.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, + { + "from": [10, 5, 26.375], + "to": [10.125, 5.125, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.875, 8.125, 23.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, + { + "from": [9.75, 5, 26.5], + "to": [9.875, 5.125, 26.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.625, 8.125, 23.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#4"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#4"} + } + }, { "from": [12, 2.625, -11.9375], "to": [12.5, 3.75, -11.75], @@ -5342,7 +5499,7 @@ }, { "from": [7.75, 1.75, 10.5], - "to": [8, 2, 17.875], + "to": [8, 2, 18.125], "rotation": {"angle": 0, "axis": "y", "origin": [3.25, 3.75, -1.875]}, "faces": { "north": {"uv": [5.875, 9.75, 5.90625, 9.78125], "texture": "#0"}, @@ -5354,7 +5511,7 @@ } }, { - "from": [7.75, 1.75, -1.875], + "from": [7.75, 1.75, -2.125], "to": [8, 2, 5.5], "rotation": {"angle": 0, "axis": "y", "origin": [3.25, 3.75, -1.875]}, "faces": { @@ -6046,13 +6203,111 @@ "name": "Flap", "origin": [16.75, 8, 9.875], "color": 0, - "children": [267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302] + "children": [ + 267, + 268, + 269, + 270, + 271, + 272, + 273, + 274, + 275, + 276, + 277, + 278, + 279, + 280, + 281, + 282, + 283, + 284, + 285, + 286, + 287, + 288, + 289, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 299, + 300, + 301, + 302, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [303, 304, 305] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [306, 307, 308] + } + ] }, { "name": "Flap", "origin": [16.75, 8, 9.875], "color": 0, - "children": [303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338] + "children": [ + 309, + 310, + 311, + 312, + 313, + 314, + 315, + 316, + 317, + 318, + 319, + 320, + 321, + 322, + 323, + 324, + 325, + 326, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + 342, + 343, + 344, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [345, 346, 347] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [348, 349, 350] + } + ] } ] }, @@ -6070,19 +6325,19 @@ "name": "BufferL", "origin": [25.75, -11, -12.125], "color": 0, - "children": [339, 340, 341, 342, 343] + "children": [351, 352, 353, 354, 355] }, { "name": "BufferR", "origin": [-6.25, -11, -12.125], "color": 0, - "children": [344, 345, 346, 347, 348] + "children": [356, 357, 358, 359, 360] }, { "name": "Holder", "origin": [8.75, -2, 1.875], "color": 0, - "children": [349, 350] + "children": [361, 362] }, { "name": "Brake", @@ -6093,13 +6348,13 @@ "name": "AirPipe", "origin": [3.95, 2.4, 8.075], "color": 0, - "children": [351, 352, 353] + "children": [363, 364, 365] }, { "name": "AirPipe", "origin": [3.95, 2.4, 8.075], "color": 0, - "children": [354, 355, 356] + "children": [366, 367, 368] } ] }, @@ -6107,13 +6362,13 @@ "name": "FlapSupport", "origin": [8.75, -2, 1.875], "color": 0, - "children": [357, 358, 359, 360] + "children": [369, 370, 371, 372] }, { "name": "StepR", "origin": [8.75, -2, 1.875], "color": 0, - "children": [361, 362, 363, 364, 365] + "children": [373, 374, 375, 376, 377] } ] }, @@ -6126,19 +6381,19 @@ "name": "BufferL", "origin": [25.75, -11, -12.125], "color": 0, - "children": [366, 367, 368, 369, 370] + "children": [378, 379, 380, 381, 382] }, { "name": "BufferR", "origin": [-6.25, -11, -12.125], "color": 0, - "children": [371, 372, 373, 374, 375] + "children": [383, 384, 385, 386, 387] }, { "name": "Holder", "origin": [8.75, -2, 1.875], "color": 0, - "children": [376, 377] + "children": [388, 389] }, { "name": "Brake", @@ -6149,13 +6404,13 @@ "name": "AirPipe", "origin": [3.95, 2.4, 8.075], "color": 0, - "children": [378, 379, 380] + "children": [390, 391, 392] }, { "name": "AirPipe", "origin": [3.95, 2.4, 8.075], "color": 0, - "children": [381, 382, 383] + "children": [393, 394, 395] } ] }, @@ -6163,13 +6418,13 @@ "name": "FlapSupport", "origin": [8.75, -2, 1.875], "color": 0, - "children": [384, 385, 386, 387] + "children": [396, 397, 398, 399] }, { "name": "StepR", "origin": [8.75, -2, 1.875], "color": 0, - "children": [388, 389, 390, 391, 392] + "children": [400, 401, 402, 403, 404] } ] } @@ -6179,35 +6434,35 @@ "name": "AirRigging", "origin": [16.75, 8, 9.875], "color": 0, - "children": [393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409] + "children": [405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421] }, { "name": "BrakeRigging", "origin": [16.75, 8, 9.875], "color": 0, "children": [ - 410, - 411, - 412, - 413, - 414, - 415, - 416, - 417, - 418, - 419, - 420, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, { "name": "Wheel", "origin": [16.75, 8, 9.875], "color": 0, - "children": [421, 422, 423, 424, 425] + "children": [433, 434, 435, 436, 437] }, { "name": "Wheel", "origin": [16.75, 8, 9.875], "color": 0, - "children": [426, 427, 428, 429, 430] + "children": [438, 439, 440, 441, 442] } ] } diff --git a/assets/minecraft/models/item/trainmodel/lipan/lili_midori/lili_midori_bmpz.json b/assets/minecraft/models/item/trainmodel/lipan/lili_midori/lili_midori_bmpz.json index 0857f22b..46077e3a 100644 --- a/assets/minecraft/models/item/trainmodel/lipan/lili_midori/lili_midori_bmpz.json +++ b/assets/minecraft/models/item/trainmodel/lipan/lili_midori/lili_midori_bmpz.json @@ -1527,6 +1527,162 @@ "down": {"uv": [0, 12, 14, 16], "texture": "#10"} } }, + { + "from": [12.375, 2.25, -14.625], + "to": [12.5, 2.375, -14.5625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.25, 5.375, -10.9375]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [12.5, 2.25, -14.625], + "to": [12.625, 2.375, -14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9.375, 5.375, -11.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [12.25, 2.25, -14.625], + "to": [12.375, 2.375, -14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9.125, 5.375, -11.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [12.375, 2.25, 30.5625], + "to": [12.5, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.25, 5.375, 26.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, + { + "from": [12.5, 2.25, 30.5], + "to": [12.625, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.375, 5.375, 27.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, + { + "from": [12.25, 2.25, 30.5], + "to": [12.375, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [9.125, 5.375, 27.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, + { + "from": [3.5, 2.25, -14.625], + "to": [3.625, 2.375, -14.5625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.75, 5.375, -10.9375]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [3.375, 2.25, -14.625], + "to": [3.5, 2.375, -14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6.625, 5.375, -11.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [3.625, 2.25, -14.625], + "to": [3.75, 2.375, -14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6.875, 5.375, -11.25]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} + } + }, + { + "from": [3.5, 2.25, 30.5625], + "to": [3.625, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.75, 5.375, 26.9375]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, + { + "from": [3.375, 2.25, 30.5], + "to": [3.5, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.625, 5.375, 27.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, + { + "from": [3.625, 2.25, 30.5], + "to": [3.75, 2.375, 30.625], + "rotation": {"angle": 0, "axis": "y", "origin": [6.875, 5.375, 27.25]}, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#5"}, + "up": {"uv": [0, 16, 16, 0], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#5"} + } + }, { "from": [12.5, -1.995, -14.125], "to": [13, -1.495, -13.5], @@ -6011,6 +6167,37 @@ ] } ] + }, + { + "name": "LampBrackets", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [ + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [116, 117, 118] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [119, 120, 121] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [122, 123, 124] + }, + { + "name": "LampBracket", + "origin": [8.8, 8.7, -3.95], + "color": 0, + "children": [125, 126, 127] + } + ] } ] }, @@ -6023,13 +6210,13 @@ "name": "ElectricalF", "origin": [14.4, -5.3, -13], "color": 0, - "children": [116, 117, 118] + "children": [128, 129, 130] }, { "name": "ElectricalB", "origin": [14.4, -5.3, -13], "color": 0, - "children": [119, 120, 121] + "children": [131, 132, 133] } ] }, @@ -6037,72 +6224,72 @@ "name": "Windows", "origin": [13.75, 3.13, -14.5], "color": 0, - "children": [122, 123] + "children": [134, 135] }, { "name": "Body", "origin": [10.4, 8, 9], "color": 0, "children": [ - 124, - 125, - 126, - 127, - 128, + 136, + 137, + 138, + 139, + 140, { "name": "Roof", "origin": [10.4, 8, 9], "color": 0, - "children": [129, 130, 131, 132, 133] + "children": [141, 142, 143, 144, 145] }, { "name": "F", "origin": [10.4, 8, 9], "color": 0, - "children": [134, 135, 136, 137, 138, 139, 140, 141, 142] + "children": [146, 147, 148, 149, 150, 151, 152, 153, 154] }, { "name": "B", "origin": [10.4, 8, 9], "color": 0, - "children": [143, 144, 145, 146, 147, 148, 149, 150, 151] + "children": [155, 156, 157, 158, 159, 160, 161, 162, 163] }, - 152, + 164, { "name": "WR", "origin": [10.4, 8, 9], "color": 0, - "children": [153, 154, 155, 156, 157, 158, 159, 160] + "children": [165, 166, 167, 168, 169, 170, 171, 172] }, { "name": "WL", "origin": [10.4, 8, 9], "color": 0, - "children": [161, 162, 163, 164, 165, 166, 167] + "children": [173, 174, 175, 176, 177, 178, 179] }, { "name": "VestibuleDividerF", "origin": [10.4, 8, 9], "color": 0, - "children": [168, 169, 170, 171, 172, 173, 174] + "children": [180, 181, 182, 183, 184, 185, 186] }, { "name": "VestibuleDividerB", "origin": [10.4, 8, 9], "color": 0, - "children": [175, 176, 177, 178, 179, 180] + "children": [187, 188, 189, 190, 191, 192] }, { "name": "Toilet Divider", "origin": [10.4, 8, 9], "color": 0, - "children": [181, 182, 183, 184, 185, 186, 187] + "children": [193, 194, 195, 196, 197, 198, 199] }, { "name": "Gutters", "origin": [10.4, 8, 9], "color": 0, - "children": [188, 189, 190, 191] + "children": [200, 201, 202, 203] } ] }, @@ -6115,19 +6302,19 @@ "name": "ToiletDoor", "origin": [18.2, -4, 18.9], "color": 0, - "children": [192, 193] + "children": [204, 205] }, { "name": "SaloonDoor", "origin": [15, -4, -9], "color": 0, - "children": [194] + "children": [206] }, { "name": "SaloonDoorC", "origin": [15, -4, -9], "color": 0, - "children": [195, 196] + "children": [207, 208] }, { "name": "GangwayDoorSet", @@ -6138,13 +6325,13 @@ "name": "GangwayDoor", "origin": [2.6, -10, -12.7], "color": 0, - "children": [197, 198, 199, 200, 201] + "children": [209, 210, 211, 212, 213] }, { "name": "GangwayDoor", "origin": [2.6, -10, -12.7], "color": 0, - "children": [202, 203, 204, 205, 206] + "children": [214, 215, 216, 217, 218] } ] }, @@ -6157,13 +6344,13 @@ "name": "GangwayDoor", "origin": [2.6, -10, -12.7], "color": 0, - "children": [207, 208, 209, 210, 211] + "children": [219, 220, 221, 222, 223] }, { "name": "GangwayDoor", "origin": [2.6, -10, -12.7], "color": 0, - "children": [212, 213, 214, 215, 216] + "children": [224, 225, 226, 227, 228] } ] } @@ -6188,13 +6375,13 @@ "name": "Table", "origin": [10.4, 8, 9], "color": 0, - "children": [217, 218] + "children": [229, 230] }, { "name": "Table", "origin": [10.4, 8, 9], "color": 0, - "children": [219, 220] + "children": [231, 232] } ] }, @@ -6222,25 +6409,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [221, 222, 223] + "children": [233, 234, 235] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [224, 225, 226] + "children": [236, 237, 238] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [227, 228, 229] + "children": [239, 240, 241] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [230, 231, 232] + "children": [242, 243, 244] } ] } @@ -6260,25 +6447,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [233, 234, 235] + "children": [245, 246, 247] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [236, 237, 238] + "children": [248, 249, 250] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [239, 240, 241] + "children": [251, 252, 253] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [242, 243, 244] + "children": [254, 255, 256] } ] } @@ -6298,25 +6485,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [245, 246, 247] + "children": [257, 258, 259] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [248, 249, 250] + "children": [260, 261, 262] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [251, 252, 253] + "children": [263, 264, 265] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [254, 255, 256] + "children": [266, 267, 268] } ] }, @@ -6329,25 +6516,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [257, 258, 259] + "children": [269, 270, 271] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [260, 261, 262] + "children": [272, 273, 274] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [263, 264, 265] + "children": [275, 276, 277] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [266, 267, 268] + "children": [278, 279, 280] } ] } @@ -6367,25 +6554,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [269, 270, 271] + "children": [281, 282, 283] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [272, 273, 274] + "children": [284, 285, 286] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [275, 276, 277] + "children": [287, 288, 289] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [278, 279, 280] + "children": [290, 291, 292] } ] }, @@ -6398,25 +6585,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [281, 282, 283] + "children": [293, 294, 295] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [284, 285, 286] + "children": [296, 297, 298] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [287, 288, 289] + "children": [299, 300, 301] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [290, 291, 292] + "children": [302, 303, 304] } ] } @@ -6436,25 +6623,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [293, 294, 295] + "children": [305, 306, 307] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [296, 297, 298] + "children": [308, 309, 310] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [299, 300, 301] + "children": [311, 312, 313] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [302, 303, 304] + "children": [314, 315, 316] } ] }, @@ -6467,25 +6654,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [305, 306, 307] + "children": [317, 318, 319] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [308, 309, 310] + "children": [320, 321, 322] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [311, 312, 313] + "children": [323, 324, 325] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [314, 315, 316] + "children": [326, 327, 328] } ] } @@ -6512,19 +6699,19 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [317, 318, 319] + "children": [329, 330, 331] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [320, 321] + "children": [332, 333] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [322, 323] + "children": [334, 335] } ] }, @@ -6532,7 +6719,7 @@ "name": "Railing", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [324, 325, 326] + "children": [336, 337, 338] } ] }, @@ -6550,25 +6737,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [327, 328, 329] + "children": [339, 340, 341] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [330, 331, 332] + "children": [342, 343, 344] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [333, 334, 335] + "children": [345, 346, 347] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [336, 337, 338] + "children": [348, 349, 350] } ] }, @@ -6581,25 +6768,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [339, 340, 341] + "children": [351, 352, 353] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [342, 343, 344] + "children": [354, 355, 356] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [345, 346, 347] + "children": [357, 358, 359] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [348, 349, 350] + "children": [360, 361, 362] } ] } @@ -6619,25 +6806,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [351, 352, 353] + "children": [363, 364, 365] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [354, 355, 356] + "children": [366, 367, 368] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [357, 358, 359] + "children": [369, 370, 371] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [360, 361, 362] + "children": [372, 373, 374] } ] }, @@ -6650,25 +6837,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [363, 364, 365] + "children": [375, 376, 377] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [366, 367, 368] + "children": [378, 379, 380] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [369, 370, 371] + "children": [381, 382, 383] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [372, 373, 374] + "children": [384, 385, 386] } ] } @@ -6688,25 +6875,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [375, 376, 377] + "children": [387, 388, 389] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [378, 379, 380] + "children": [390, 391, 392] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [381, 382, 383] + "children": [393, 394, 395] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [384, 385, 386] + "children": [396, 397, 398] } ] }, @@ -6719,25 +6906,25 @@ "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [387, 388, 389] + "children": [399, 400, 401] }, { "name": "Seat", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [390, 391, 392] + "children": [402, 403, 404] }, { "name": "Armrests", "origin": [10.4, 8, 9], "color": 0, - "children": [393, 394, 395] + "children": [405, 406, 407] }, { "name": "Support", "origin": [17.02, 4.5, 17.9], "color": 0, - "children": [396, 397, 398] + "children": [408, 409, 410] } ] } @@ -6756,25 +6943,25 @@ "name": "RackL", "origin": [4.3, -0.5, -9], "color": 0, - "children": [399, 400] + "children": [411, 412] }, { "name": "RackR", "origin": [4.3, -0.5, -9], "color": 0, - "children": [401, 402] + "children": [413, 414] }, { "name": "group", "origin": [10.4, 8, 9], "color": 0, - "children": [403] + "children": [415] }, { "name": "group", "origin": [10.4, 8, 9], "color": 0, - "children": [404, 405, 406] + "children": [416, 417, 418] } ] } @@ -6789,25 +6976,25 @@ "name": "Railing", "origin": [15, -1.5, 10.8], "color": 0, - "children": [407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418] + "children": [419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430] }, { "name": "Toilet", "origin": [15.2, -4, 10.8], "color": 0, - "children": [419, 420, 421, 422, 423, 424, 425, 426] + "children": [431, 432, 433, 434, 435, 436, 437, 438] }, { "name": "Bidet", "origin": [10.4, 8, 9], "color": 0, - "children": [427, 428, 429, 430] + "children": [439, 440, 441, 442] }, { "name": "Table", "origin": [10.4, 8, 9], "color": 0, - "children": [431, 432, 433, 434, 435, 436, 437] + "children": [443, 444, 445, 446, 447, 448, 449] } ] }, @@ -6815,7 +7002,7 @@ "name": "Lights", "origin": [10.4, 8, 9], "color": 0, - "children": [438, 439, 440] + "children": [450, 451, 452] } ] }, @@ -6823,7 +7010,7 @@ "name": "Posters", "origin": [8, 8, 8], "color": 0, - "children": [441] + "children": [453] } ] } diff --git a/assets/minecraft/models/item/trainmodel/lipan/lili_utility/eot_signal.json b/assets/minecraft/models/item/trainmodel/lipan/lili_utility/eot_signal.json new file mode 100644 index 00000000..48d96e25 --- /dev/null +++ b/assets/minecraft/models/item/trainmodel/lipan/lili_utility/eot_signal.json @@ -0,0 +1,98 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "block/lipan/lili/eot_signal", + "particle": "block/lipan/lili/eot_signal" + }, + "elements": [ + { + "from": [7.8, 0.95, 7.99], + "to": [7.85, 1.15, 8.04], + "rotation": {"angle": 0, "axis": "y", "origin": [7.7, 0.95, 7.99]}, + "faces": { + "north": {"uv": [5.5, 6, 5.75, 7], "texture": "#0"}, + "east": {"uv": [6, 6, 6.25, 7], "texture": "#0"}, + "south": {"uv": [6.5, 1, 6.75, 2], "texture": "#0"}, + "west": {"uv": [6.5, 2, 6.75, 3], "texture": "#0"}, + "up": {"uv": [7.75, 2.75, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [3.25, 7.5, 3, 7.75], "texture": "#0"} + } + }, + { + "from": [7.95, 0, 7.99], + "to": [8.05, 0.2, 8.04], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9, 0, 7.99]}, + "faces": { + "north": {"uv": [5.5, 1, 6, 2], "texture": "#0"}, + "east": {"uv": [6.5, 5, 6.75, 6], "texture": "#0"}, + "south": {"uv": [5.5, 2, 6, 3], "texture": "#0"}, + "west": {"uv": [6.5, 6, 6.75, 7], "texture": "#0"}, + "up": {"uv": [6, 7.25, 5.5, 7], "texture": "#0"}, + "down": {"uv": [6.5, 7, 6, 7.25], "texture": "#0"} + } + }, + { + "from": [7.75, 0.2, 7.99], + "to": [8.25, 0.95, 8.04], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9, 0.2, 7.99]}, + "faces": { + "north": {"uv": [0, 0, 2.5, 3.75], "texture": "#0"}, + "east": {"uv": [5, 0, 5.25, 3.75], "texture": "#0"}, + "south": {"uv": [2.5, 0, 5, 3.75], "texture": "#0"}, + "west": {"uv": [5, 4, 5.25, 7.75], "texture": "#0"}, + "up": {"uv": [8, 0.25, 5.5, 0], "texture": "#0"}, + "down": {"uv": [8, 0.5, 5.5, 0.75], "texture": "#0"} + } + }, + { + "from": [8.15, 0.95, 7.99], + "to": [8.2, 1.15, 8.04], + "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 0.95, 7.99]}, + "faces": { + "north": {"uv": [5.5, 5, 5.75, 6], "texture": "#0"}, + "east": {"uv": [6, 1, 6.25, 2], "texture": "#0"}, + "south": {"uv": [6, 2, 6.25, 3], "texture": "#0"}, + "west": {"uv": [6, 5, 6.25, 6], "texture": "#0"}, + "up": {"uv": [6.75, 7.25, 6.5, 7], "texture": "#0"}, + "down": {"uv": [7.75, 1.5, 7.5, 1.75], "texture": "#0"} + } + }, + { + "from": [7.85, 1.1, 7.99], + "to": [8.15, 1.15, 8.04], + "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0.95, 7.99]}, + "faces": { + "north": {"uv": [5.5, 3, 7, 3.25], "texture": "#0"}, + "east": {"uv": [7.5, 2, 7.75, 2.25], "texture": "#0"}, + "south": {"uv": [5.5, 3.5, 7, 3.75], "texture": "#0"}, + "west": {"uv": [2.5, 7.5, 2.75, 7.75], "texture": "#0"}, + "up": {"uv": [7, 4.25, 5.5, 4], "texture": "#0"}, + "down": {"uv": [7, 4.5, 5.5, 4.75], "texture": "#0"} + } + }, + { + "from": [7.775, 0.25, 7.98], + "to": [8.225, 0.9, 7.99], + "light_emission": 7, + "rotation": {"angle": 0, "axis": "y", "origin": [7.9, 0.2, 7.94]}, + "faces": { + "north": {"uv": [0, 4, 2.25, 7.25], "texture": "#0"}, + "east": {"uv": [7, 1, 7.0625, 4.25], "texture": "#0"}, + "south": {"uv": [2.5, 4, 4.75, 7.25], "texture": "#0"}, + "west": {"uv": [7, 4.5, 7.0625, 7.75], "texture": "#0"}, + "up": {"uv": [2.25, 7.5625, 0, 7.5], "texture": "#0"}, + "down": {"uv": [9.75, 1, 7.5, 1.0625], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "eot_signal", + "origin": [7.7, 7.5, 7.99], + "color": 0, + "children": [0, 1, 2, 3, 4, 5] + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/textures/block/lipan/lili/eot_signal.png b/assets/minecraft/textures/block/lipan/lili/eot_signal.png new file mode 100644 index 00000000..5088229d Binary files /dev/null and b/assets/minecraft/textures/block/lipan/lili/eot_signal.png differ diff --git a/assets/minecraft/textures/block/lipan/lili_multipurpose_flat/lili_multipurpose_flat_body_lipan.png b/assets/minecraft/textures/block/lipan/lili_multipurpose_flat/lili_multipurpose_flat_body_lipan.png index 7e299fc2..a7f6898c 100644 Binary files a/assets/minecraft/textures/block/lipan/lili_multipurpose_flat/lili_multipurpose_flat_body_lipan.png and b/assets/minecraft/textures/block/lipan/lili_multipurpose_flat/lili_multipurpose_flat_body_lipan.png differ