kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

完善牛头王贴图

Browse source
This commit is contained in:
Atsuihsio 2024-07-16 00:06:35 +08:00
parent f77d418978
commit 07187e3e6a
6 changed files with 67 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/mcreator/target/client/model/item/Ntw20Model.java
View file

@ -76,9 +76,9 @@ public class Ntw20Model extends GeoModel<Ntw20> {
double p = player.getPersistentData().getDouble("zoom_pos"); double p = player.getPersistentData().getDouble("zoom_pos");
double zp = player.getPersistentData().getDouble("zoom_pos_z"); double zp = player.getPersistentData().getDouble("zoom_pos_z");
gun.setPosX(4.528f * (float) p); gun.setPosX(4.53f * (float) p);
gun.setPosY(-0.43f * (float) p - (float) (0.2f * zp)); gun.setPosY(-0.44f * (float) p - (float) (0.2f * zp));
gun.setPosZ(10.0f * (float) p + (float) (0.3f * zp)); gun.setPosZ(10.0f * (float) p + (float) (0.3f * zp));

2
src/main/resources/assets/target/geo/ntw_20.geo.json
View file

@ -8540,7 +8540,7 @@
"pivot": [0, 7.72344, -82.76641], "pivot": [0, 7.72344, -82.76641],
"cubes": [ "cubes": [
{ {
"origin": [-9.8154, -2.09196, -82.76641], "origin": [-9.8154, -2.09196, -50.76641],
"size": [19.6308, 19.6308, 0], "size": [19.6308, 19.6308, 0],
"uv": { "uv": {
"south": {"uv": [95.2625, 54.25], "uv_size": [32, 32]} "south": {"uv": [95.2625, 54.25], "uv_size": [32, 32]}

170
src/main/resources/assets/target/models/item/ntw_203d.json
View file

@ -7,8 +7,9 @@
}, },
"elements": [ "elements": [
{ {
"from": [7, 4, -1], "from": [7, 4.5, 8.8],
"to": [9, 7, 26], "to": [9, 6.25, 30],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [2.25, 6, 2.75, 6.75], "texture": "#0"}, "north": {"uv": [2.25, 6, 2.75, 6.75], "texture": "#0"},
"east": {"uv": [0, 0, 6.75, 0.75], "texture": "#0"}, "east": {"uv": [0, 0, 6.75, 0.75], "texture": "#0"},
@ -19,20 +20,9 @@
} }
}, },
{ {
"from": [6.75, 6, 22], "from": [7, 2.75, 30],
"to": [9.25, 7.25, 25.5], "to": [9, 6.25, 31.25],
"faces": { "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"north": {"uv": [6.75, 1.25, 7.5, 1.5], "texture": "#0"},
"east": {"uv": [1, 6.25, 2, 6.5], "texture": "#0"},
"south": {"uv": [6.75, 5, 7.5, 5.25], "texture": "#0"},
"west": {"uv": [6.25, 3, 7.25, 3.25], "texture": "#0"},
"up": {"uv": [4.5, 3, 3.75, 2], "texture": "#0"},
"down": {"uv": [4.5, 3, 3.75, 4], "texture": "#0"}
}
},
{
"from": [7, 1.5, 26],
"to": [9, 7, 27.25],
"faces": { "faces": {
"north": {"uv": [2, 4, 2.5, 5.5], "texture": "#0"}, "north": {"uv": [2, 4, 2.5, 5.5], "texture": "#0"},
"east": {"uv": [2.75, 6, 3, 7.5], "texture": "#0"}, "east": {"uv": [2.75, 6, 3, 7.5], "texture": "#0"},
@ -43,8 +33,9 @@
} }
}, },
{ {
"from": [2.5, 4.5, 16.5], "from": [2.5, 4.75, 20.5],
"to": [7, 6.25, 21.75], "to": [7, 6, 25.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [4.5, 2, 5.75, 2.5], "texture": "#0"}, "north": {"uv": [4.5, 2, 5.75, 2.5], "texture": "#0"},
"east": {"uv": [4.5, 2.5, 5.75, 3], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.75, 3], "texture": "#0"},
@ -55,8 +46,9 @@
} }
}, },
{ {
"from": [7, 2.25, 21], "from": [7, 2.75, 25],
"to": [9, 4, 26], "to": [9, 4.5, 30],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [6.25, 5, 6.75, 5.5], "texture": "#0"}, "north": {"uv": [6.25, 5, 6.75, 5.5], "texture": "#0"},
"east": {"uv": [4, 4.5, 5.25, 5], "texture": "#0"}, "east": {"uv": [4, 4.5, 5.25, 5], "texture": "#0"},
@ -67,35 +59,9 @@
} }
}, },
{ {
"from": [7.5, 2.0795, 18.17417], "from": [7.5, 2.23413, 20.15879],
"to": [8.5, 2.8295, 21.17417], "to": [8.5, 4.73413, 21.40879],
"rotation": {"angle": -45, "axis": "x", "origin": [8, 2.4545, 19.67417]}, "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 1.73413, 21.03379]},
"faces": {
"north": {"uv": [5.75, 6, 6, 6.25], "texture": "#0"},
"east": {"uv": [6.75, 5.25, 7.5, 5.5], "texture": "#0"},
"south": {"uv": [4.75, 7.25, 5, 7.5], "texture": "#0"},
"west": {"uv": [6.75, 5.5, 7.5, 5.75], "texture": "#0"},
"up": {"uv": [2.75, 7.5, 2.5, 6.75], "texture": "#0"},
"down": {"uv": [6, 6.75, 5.75, 7.5], "texture": "#0"}
}
},
{
"from": [7.5, 1.12868, 16.87868],
"to": [8.5, 1.87868, 18.87868],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 1.50368, 17.37868]},
"faces": {
"north": {"uv": [5, 7.25, 5.25, 7.5], "texture": "#0"},
"east": {"uv": [7.25, 0.25, 7.75, 0.5], "texture": "#0"},
"south": {"uv": [5.25, 7.25, 5.5, 7.5], "texture": "#0"},
"west": {"uv": [7.25, 0.5, 7.75, 0.75], "texture": "#0"},
"up": {"uv": [2, 7.5, 1.75, 7], "texture": "#0"},
"down": {"uv": [1.25, 7.25, 1, 7.75], "texture": "#0"}
}
},
{
"from": [7.5, 1.23413, 16.65879],
"to": [8.5, 3.73413, 17.40879],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 1.73413, 17.03379]},
"faces": { "faces": {
"north": {"uv": [6.75, 5.75, 7, 6.5], "texture": "#0"}, "north": {"uv": [6.75, 5.75, 7, 6.5], "texture": "#0"},
"east": {"uv": [6, 6.75, 6.25, 7.5], "texture": "#0"}, "east": {"uv": [6, 6.75, 6.25, 7.5], "texture": "#0"},
@ -106,22 +72,9 @@
} }
}, },
{ {
"from": [7, 4.37868, -1.5], "from": [7.25, 3.75, 10.75],
"to": [9, 6.37868, 0.5], "to": [8.75, 4.5, 25],
"rotation": {"angle": -45, "axis": "x", "origin": [8, 4.87868, -1]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.625, 15.25]},
"faces": {
"north": {"uv": [5.75, 6.25, 6.25, 6.75], "texture": "#0"},
"east": {"uv": [6.25, 6, 6.75, 6.5], "texture": "#0"},
"south": {"uv": [1, 6.5, 1.5, 7], "texture": "#0"},
"west": {"uv": [1.5, 6.5, 2, 7], "texture": "#0"},
"up": {"uv": [3.75, 7, 3.25, 6.5], "texture": "#0"},
"down": {"uv": [6.75, 6.5, 6.25, 7], "texture": "#0"}
}
},
{
"from": [7.25, 3.25, 6.75],
"to": [8.75, 4, 21],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 3.625, 11.25]},
"faces": { "faces": {
"north": {"uv": [7.25, 0.75, 7.75, 1], "texture": "#0"}, "north": {"uv": [7.25, 0.75, 7.75, 1], "texture": "#0"},
"east": {"uv": [3.75, 1.5, 7.25, 1.75], "texture": "#0"}, "east": {"uv": [3.75, 1.5, 7.25, 1.75], "texture": "#0"},
@ -132,22 +85,22 @@
} }
}, },
{ {
"from": [7.5, 2.75, 8], "from": [7.25, 3.5, 9.75],
"to": [8.5, 3.25, 14.75], "to": [8.75, 3.75, 12.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 3.625, 11.25]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.125, 15.25]},
"faces": { "faces": {
"north": {"uv": [6.5, 7.25, 6.75, 7.5], "texture": "#0"}, "north": {"uv": [7.25, 0.75, 7.75, 1], "texture": "#0"},
"east": {"uv": [5.75, 3.5, 7.5, 3.75], "texture": "#0"}, "east": {"uv": [3.75, 1.5, 7.25, 1.75], "texture": "#0"},
"south": {"uv": [6.75, 7.25, 7, 7.5], "texture": "#0"}, "south": {"uv": [1.25, 7.25, 1.75, 7.5], "texture": "#0"},
"west": {"uv": [5.75, 3.75, 7.5, 4], "texture": "#0"}, "west": {"uv": [3.75, 1.75, 7.25, 2], "texture": "#0"},
"up": {"uv": [5.25, 7.25, 5, 5.5], "texture": "#0"}, "up": {"uv": [1.5, 5, 1, 1.5], "texture": "#0"},
"down": {"uv": [2.25, 6, 2, 7.75], "texture": "#0"} "down": {"uv": [2, 1.5, 1.5, 5], "texture": "#0"}
} }
}, },
{ {
"from": [7, 3, 2.5], "from": [7, 3.1, 3.75],
"to": [7.5, 3.5, 7.25], "to": [7.5, 3.6, 10.75],
"rotation": {"angle": -45, "axis": "z", "origin": [7.5, 3.5, 2.125]}, "rotation": {"angle": -45, "axis": "z", "origin": [7.5, 3.6, 3.375]},
"faces": { "faces": {
"north": {"uv": [7, 7.25, 7.25, 7.5], "texture": "#0"}, "north": {"uv": [7, 7.25, 7.25, 7.5], "texture": "#0"},
"east": {"uv": [6, 4.5, 7.25, 4.75], "texture": "#0"}, "east": {"uv": [6, 4.5, 7.25, 4.75], "texture": "#0"},
@ -158,9 +111,9 @@
} }
}, },
{ {
"from": [6.9, 2.9, 1.5], "from": [6.9, 3, 2.75],
"to": [7.6, 3.6, 2.5], "to": [7.6, 3.7, 3.75],
"rotation": {"angle": -45, "axis": "z", "origin": [7.5, 3.5, 2.125]}, "rotation": {"angle": -45, "axis": "z", "origin": [7.5, 3.6, 3.375]},
"faces": { "faces": {
"north": {"uv": [1.25, 7.5, 1.5, 7.75], "texture": "#0"}, "north": {"uv": [1.25, 7.5, 1.5, 7.75], "texture": "#0"},
"east": {"uv": [7.5, 1.25, 7.75, 1.5], "texture": "#0"}, "east": {"uv": [7.5, 1.25, 7.75, 1.5], "texture": "#0"},
@ -171,9 +124,9 @@
} }
}, },
{ {
"from": [8.4, 2.9, 1.5], "from": [8.4, 3, 2.75],
"to": [9.1, 3.6, 2.5], "to": [9.1, 3.7, 3.75],
"rotation": {"angle": 45, "axis": "z", "origin": [8.5, 3.5, 2.125]}, "rotation": {"angle": 45, "axis": "z", "origin": [8.5, 3.6, 3.375]},
"faces": { "faces": {
"north": {"uv": [2.75, 7.5, 3, 7.75], "texture": "#0"}, "north": {"uv": [2.75, 7.5, 3, 7.75], "texture": "#0"},
"east": {"uv": [7.5, 2.75, 7.75, 3], "texture": "#0"}, "east": {"uv": [7.5, 2.75, 7.75, 3], "texture": "#0"},
@ -184,9 +137,9 @@
} }
}, },
{ {
"from": [8.5, 3, 2.5], "from": [8.5, 3.1, 3.75],
"to": [9, 3.5, 7.25], "to": [9, 3.6, 10.75],
"rotation": {"angle": 45, "axis": "z", "origin": [8.5, 3.5, 2.125]}, "rotation": {"angle": 45, "axis": "z", "origin": [8.5, 3.6, 3.375]},
"faces": { "faces": {
"north": {"uv": [7.5, 3.75, 7.75, 4], "texture": "#0"}, "north": {"uv": [7.5, 3.75, 7.75, 4], "texture": "#0"},
"east": {"uv": [6.25, 2.5, 7.5, 2.75], "texture": "#0"}, "east": {"uv": [6.25, 2.5, 7.5, 2.75], "texture": "#0"},
@ -197,8 +150,9 @@
} }
}, },
{ {
"from": [7.25, 7, 8.5], "from": [7.25, 6.2, 9.6],
"to": [8.75, 7.5, 16.75], "to": [8.75, 6.9, 15.85],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [7.25, 1.5, 7.75, 1.75], "texture": "#0"}, "north": {"uv": [7.25, 1.5, 7.75, 1.75], "texture": "#0"},
"east": {"uv": [5.75, 2, 7.75, 2.25], "texture": "#0"}, "east": {"uv": [5.75, 2, 7.75, 2.25], "texture": "#0"},
@ -209,8 +163,9 @@
} }
}, },
{ {
"from": [7.5, 7.5, 12], "from": [7.75, 6.9, 12],
"to": [8.5, 7.75, 15.75], "to": [8.25, 7.15, 15.25],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [7.5, 4.25, 7.75, 4.5], "texture": "#0"}, "north": {"uv": [7.5, 4.25, 7.75, 4.5], "texture": "#0"},
"east": {"uv": [6.25, 3.25, 7.25, 3.5], "texture": "#0"}, "east": {"uv": [6.25, 3.25, 7.25, 3.5], "texture": "#0"},
@ -221,8 +176,9 @@
} }
}, },
{ {
"from": [7, 7.75, 12], "from": [7.5, 7.15, 12],
"to": [9, 9.75, 15.75], "to": [8.5, 8.15, 15.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [4, 6.75, 4.5, 7.25], "texture": "#0"}, "north": {"uv": [4, 6.75, 4.5, 7.25], "texture": "#0"},
"east": {"uv": [2, 5.5, 3, 6], "texture": "#0"}, "east": {"uv": [2, 5.5, 3, 6], "texture": "#0"},
@ -233,8 +189,9 @@
} }
}, },
{ {
"from": [6.75, 6, 7], "from": [6.75, 6, 11],
"to": [7, 8, 7.75], "to": [7, 9.5, 11.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [3, 7.25, 3.25, 7.75], "texture": "#0"}, "north": {"uv": [3, 7.25, 3.25, 7.75], "texture": "#0"},
"east": {"uv": [7.25, 3, 7.5, 3.5], "texture": "#0"}, "east": {"uv": [7.25, 3, 7.5, 3.5], "texture": "#0"},
@ -245,8 +202,9 @@
} }
}, },
{ {
"from": [6.75, 8, 7], "from": [6.75, 9.5, 11],
"to": [9.3, 8.25, 7.75], "to": [9.3, 9.75, 11.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [1, 7, 1.75, 7.25], "texture": "#0"}, "north": {"uv": [1, 7, 1.75, 7.25], "texture": "#0"},
"east": {"uv": [7.5, 4.75, 7.75, 5], "texture": "#0"}, "east": {"uv": [7.5, 4.75, 7.75, 5], "texture": "#0"},
@ -257,8 +215,9 @@
} }
}, },
{ {
"from": [9.05, 6, 7], "from": [9.05, 6, 11],
"to": [9.3, 8, 7.75], "to": [9.3, 9.5, 11.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": { "faces": {
"north": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}, "north": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"},
"east": {"uv": [7.25, 4, 7.5, 4.5], "texture": "#0"}, "east": {"uv": [7.25, 4, 7.5, 4.5], "texture": "#0"},
@ -269,8 +228,8 @@
} }
}, },
{ {
"from": [7.5, 4.75, -13], "from": [7.5, 4.75, -14],
"to": [8.5, 5.75, -1], "to": [8.5, 5.75, 8.75],
"faces": { "faces": {
"north": {"uv": [7.5, 5.25, 7.75, 5.5], "texture": "#0"}, "north": {"uv": [7.5, 5.25, 7.75, 5.5], "texture": "#0"},
"east": {"uv": [3.75, 4, 6.75, 4.25], "texture": "#0"}, "east": {"uv": [3.75, 4, 6.75, 4.25], "texture": "#0"},
@ -281,8 +240,8 @@
} }
}, },
{ {
"from": [6.5, 4.75, -16], "from": [7, 4.75, -16],
"to": [9.5, 5.75, -13], "to": [9, 5.75, -14],
"faces": { "faces": {
"north": {"uv": [7, 6, 7.75, 6.25], "texture": "#0"}, "north": {"uv": [7, 6, 7.75, 6.25], "texture": "#0"},
"east": {"uv": [7, 6.25, 7.75, 6.5], "texture": "#0"}, "east": {"uv": [7, 6.25, 7.75, 6.5], "texture": "#0"},
@ -295,15 +254,14 @@
], ],
"display": { "display": {
"thirdperson_righthand": { "thirdperson_righthand": {
"translation": [-0.75, 3.75, -3.75], "translation": [-0.75, 3.75, -8.5],
"scale": [0.8, 0.8, 0.8] "scale": [0.8, 0.8, 0.8]
}, },
"thirdperson_lefthand": { "thirdperson_lefthand": {
"scale": [0, 0, 0] "scale": [0, 0, 0]
}, },
"ground": { "ground": {
"translation": [0, 5.25, 0], "translation": [0, 5.25, 0]
"scale": [0.8, 0.8, 0.8]
}, },
"gui": { "gui": {
"rotation": [30, -145, 0], "rotation": [30, -145, 0],
@ -324,7 +282,7 @@
"name": "group", "name": "group",
"origin": [0, 0, 0], "origin": [0, 0, 0],
"color": 0, "color": 0,
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
} }
] ]
} }

BIN
src/main/resources/assets/target/textures/gun_icon/ntw_20_icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
src/main/resources/assets/target/textures/item/ntw_203d.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 654 B

BIN
src/main/resources/assets/target/textures/item/ntw_20_icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB