Skip to content

eans added and coupler rework #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PanPan-22 merged 2 commits into from
Sep 28, 2025
Merged

eans added and coupler rework #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77e249b
eans added and coupler rework
PanPan-22 Sep 28, 2025
27990f1
Merge branch 'master' into master
PanPan-22 Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions assets/minecraft/items/iron_ingot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,20 @@
"model": "item/trainmodel/lipan/lili_utility/eot_signal"
}
},
{
"threshold": 2030,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_y25/lili_y25"
}
},
{
"threshold": 2031,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_wagons/e/lili_eans/lili_eans_body"
}
},
{
"threshold": 1125,
"model": {
Expand Down Expand Up @@ -2262,6 +2276,40 @@
}
},
{
"threshold": 99000,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_utility/couplers/knuckle-e"
}
},
{
"threshold": 99001,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_utility/couplers/knuckle-h"
}
},
{
"threshold": 99002,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_utility/couplers/knuckle-f"
}
},
{
"threshold": 99003,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_utility/couplers/knuckle-se"
}
},
{
"threshold": 99999,
"model": {
"type": "model",
"model": "item/trainmodel/lipan/lili_utility/eot_signal"
}
},
"threshold": 1356,
"model": {
"type": "model",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/models/item/trainmodel/lipan/l1222/l_1222_bogie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3538,7 +3538,7 @@
}
},
{
"from": [8, 2.5625, -1.5],
"from": [7.875, 2.5625, -1.25],
"to": [8.125, 2.6875, -1],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 2.5625, -1.625]},
"faces": {
Expand Down Expand Up @@ -3643,7 +3643,7 @@
},
{
"from": [7.625, 3.1875, -0.25],
"to": [8.375, 3.9375, 1.25],
"to": [8.375, 3.9375, 1.75],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 2.9375, -0.75]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#3"},
Expand Down Expand Up @@ -4161,7 +4161,7 @@
},
{
"name": "Knuckle-F",
"origin": [10.28, 8, 8],
"origin": [10.2925, 13.23661, 8],
"color": 0,
"children": [269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282]
}
Expand Down
190 changes: 1 addition & 189 deletions assets/minecraft/models/item/trainmodel/lipan/lili_emd_htc/lili_emd_htc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4804,188 +4804,6 @@
"down": {"uv": [0, 0, 16, 16], "texture": "#6"}
}
},
{
"from": [7.625, 0.9375, -2.375],
"to": [8.375, 2.1875, -1.625],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.9375, -2.875]},
"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.625, 0.5625, -2.375],
"to": [8.375, 0.9375, -2.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.5625, -2.875]},
"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, 0.5625, -2.875],
"to": [8.125, 0.6875, -2.375],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.5625, -3]},
"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, 1.0625, -2.375],
"to": [7.625, 2.0625, -1.75],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.9375, -2.875]},
"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.125, 1.0625, -2.5],
"to": [7.3125, 2.0625, -2],
"rotation": {"angle": 0, "axis": "y", "origin": [7.0625, 0.9375, -2.875]},
"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.125, 1.3125, -2.75],
"to": [7.375, 1.8125, -2.25],
"rotation": {"angle": -45, "axis": "x", "origin": [7.125, 1.5625, -2.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.625, 1.125, -3],
"to": [8.875, 1.3125, -2.4375],
"rotation": {"angle": -45, "axis": "x", "origin": [8.625, 1.5625, -2.75]},
"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.625, 1.25, -2.5],
"to": [8.875, 1.8125, -2.3125],
"rotation": {"angle": -45, "axis": "x", "origin": [8.625, 1.5625, -2.75]},
"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.375, 1.0625, -2.375],
"to": [8.625, 2.0625, -1.875],
"rotation": {"angle": 0, "axis": "y", "origin": [8.375, 0.9375, -2.875]},
"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.625, 1.3125, -2.375],
"to": [8.875, 1.8125, -2.1875],
"rotation": {"angle": 0, "axis": "y", "origin": [8.625, 0.9375, -2.875]},
"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.625, 1.1875, -1.625],
"to": [8.375, 1.9375, -0.125],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.9375, -2.125]},
"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.375, 1, -2.6875],
"to": [7.6875, 2.125, -2.375],
"rotation": {"angle": 45, "axis": "y", "origin": [7.6875, 0.9375, -2.375]},
"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.125, 0.5625, -2.625],
"to": [8.5, 2.1875, -2.375],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.9375, -3.375]},
"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.875, 1, -2.875],
"to": [8.375, 2.125, -2.625],
"rotation": {"angle": 0, "axis": "y", "origin": [7.375, 0.9375, -3.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"}
}
},
{
"name": "U",
"from": [5.125, 0.625, 15.5],
Expand Down Expand Up @@ -5603,17 +5421,11 @@
}
]
},
{
"name": "Knuckle-F",
"origin": [10.28, 8, 8],
"color": 0,
"children": [368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381]
},
{
"name": "C",
"origin": [8, 8, 8],
"color": 0,
"children": [382, 383, 384, 385, 386, 387, 388, 389, 390]
"children": [368, 369, 370, 371, 372, 373, 374, 375, 376]
}
]
}
Expand Down
Loading
Loading