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

规范化mp443

Browse source
This commit is contained in:
17146 2025-05-22 00:15:48 +08:00 • committed by Light_Quanta
parent eac7531296
commit bf29c8d1dd
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
16 changed files with 164 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
View file

@ -1,4 +1,4 @@
// 1.21.1 2025-05-22T00:12:54.9420818 Item Models: superbwarfare
// 1.21.1 2025-05-22T00:21:20.5670033 Item Models: superbwarfare
6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json
fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
@ -132,7 +132,10 @@ ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json
264482666ae2b2be05f1ab7dbc0cf7b3360cf183 assets/superbwarfare/models/item/mosin_nagant_icon.json
4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json
07eea739621349ed91ae297ed32de70d8d904e46 assets/superbwarfare/models/item/mp_443.json
e99d2028715786071c4c397a83337e00e6af2409 assets/superbwarfare/models/item/mp_443_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json
ea51ca13b0d1d2c2f265825f397a893e46e95787 assets/superbwarfare/models/item/mp_443_icon.json
9f523f08520ee193ca626e46602baddf46d2acc3 assets/superbwarfare/models/item/m_1911.json
9564d9a7a4a4f05dd6840e166d601d7fc50a29ce assets/superbwarfare/models/item/m_1911_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_1911_blueprint.json

28
src/generated/resources/assets/superbwarfare/models/item/mp_443.json Normal file
View file

@ -0,0 +1,28 @@
{
"parent": "minecraft:item/generated",
"base": {
"parent": "superbwarfare:item/mp_443_base"
},
"gui_light": "front",
"loader": "neoforge:separate_transforms",
"perspectives": {
"fixed": {
"parent": "superbwarfare:lod/mp_443"
},
"ground": {
"parent": "superbwarfare:lod/mp_443"
},
"gui": {
"parent": "superbwarfare:item/mp_443_icon"
},
"head": {
"parent": "superbwarfare:lod/mp_443"
},
"thirdperson_lefthand": {
"parent": "superbwarfare:lod/mp_443"
},
"thirdperson_righthand": {
"parent": "superbwarfare:lod/mp_443"
}
}
}

6
src/generated/resources/assets/superbwarfare/models/item/mp_443_base.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "superbwarfare:displaysettings/mp_443.item",
"textures": {
"layer0": "superbwarfare:item/mp_443"
}
}

6
src/generated/resources/assets/superbwarfare/models/item/mp_443_icon.json Normal file
View file

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

4
src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java
View file

@ -28,12 +28,12 @@ public class Mp443ItemModel extends GeoModel<Mp443Item> {
@Override
public ResourceLocation getModelResource(Mp443Item animatable) {
return Mod.loc("geo/mp443.geo.json");
return Mod.loc("geo/mp_443.geo.json");
}
@Override
public ResourceLocation getTextureResource(Mp443Item animatable) {
return Mod.loc("textures/item/mp443.png");
return Mod.loc("textures/item/mp_443.png");
}
@Override

1
src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
View file

@ -51,6 +51,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.MINIGUN);
gunItem(ModItems.MK_14);
gunItem(ModItems.MOSIN_NAGANT);
gunItem(ModItems.MP_443);
simpleItem(ModItems.EMPTY_PERK, "perk/");

14
src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java
View file

@ -44,14 +44,14 @@ public class Mp443Item extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (GunData.from(stack).reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock17.reload_empty"));
}
if (GunData.from(stack).reload.normal()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock17.reload_normal"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock17.idle"));
}
private PlayState idlePredicate(AnimationState<Mp443Item> event) {
@ -64,13 +64,13 @@ public class Mp443Item extends GunItem implements GeoItem {
&& ClientEventHandler.cantSprint == 0
&& !(GunData.from(stack).reload.normal() || GunData.from(stack).reload.empty()) && ClientEventHandler.drawTime < 0.01) {
if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock17.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock17.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock17.idle"));
}
@Override
@ -93,7 +93,7 @@ public class Mp443Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/mp443_icon.png");
return Mod.loc("textures/gun_icon/mp_443_icon.png");
}
@Override

2
src/main/resources/assets/superbwarfare/geo/mp443.geo.json → src/main/resources/assets/superbwarfare/geo/mp_443.geo.json
View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.unknown",
"identifier": "geometry.mp_443",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 4,

107
src/main/resources/assets/superbwarfare/models/displaysettings/mp_443.item.json Normal file
View file

@ -0,0 +1,107 @@
{
"credit": "Made with Blockbench",
"parent": "builtin/entity",
"texture_size": [
64,
64
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"translation": [
0,
0,
-0.5
],
"scale": [
0.35,
0.35,
0.35
]
},
"thirdperson_lefthand": {
"translation": [
0,
0,
-0.5
],
"scale": [
0.35,
0.35,
0.35
]
},
"firstperson_righthand": {
"translation": [
-7.75,
3.5,
-1.5
]
},
"firstperson_lefthand": {
"translation": [
80,
-80,
80
],
"scale": [
0,
0,
0
]
},
"ground": {
"translation": [
0,
5,
0
],
"scale": [
0.35,
0.35,
0.35
]
},
"gui": {
"rotation": [
165.69,
-39.63,
167
],
"translation": [
-0.25,
0,
0
],
"scale": [
1.7,
1.7,
1.7
]
},
"head": {
"translation": [
0,
10.25,
-1.25
]
},
"fixed": {
"rotation": [
0,
90,
0
],
"translation": [
-1,
-0.5,
-1
],
"scale": [
0.7,
0.7,
0.7
]
}
}
}

6
src/main/resources/assets/superbwarfare/models/item/mp443_icon.json
View file

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "superbwarfare:item/mp443_icon"
}
}

27
src/main/resources/assets/superbwarfare/models/item/mp_443.json
View file

@ -1,27 +0,0 @@
{
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/glock_17_base"
},
"perspectives": {
"gui": {
"parent": "superbwarfare:item/mp443_icon"
},
"thirdperson_righthand": {
"parent": "superbwarfare:item/mp443_3d"
},
"thirdperson_lefthand": {
"parent": "superbwarfare:item/mp443_3d"
},
"ground": {
"parent": "superbwarfare:item/mp443_3d"
},
"fixed": {
"parent": "superbwarfare:item/mp443_3d"
},
"head": {
"parent": "superbwarfare:item/mp443_3d"
}
}
}

4
src/main/resources/assets/superbwarfare/models/item/mp443_3d.json → src/main/resources/assets/superbwarfare/models/lod/mp_443.json
View file

@ -2,8 +2,8 @@
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "superbwarfare:item/mp443_3d",
"particle": "superbwarfare:item/mp443_3d"
"0": "superbwarfare:item/lod/mp_443",
"particle": "superbwarfare:item/lod/mp_443"
},
"elements": [
{

0
src/main/resources/assets/superbwarfare/textures/gun_icon/mp443_icon.png → src/main/resources/assets/superbwarfare/textures/gun_icon/mp_443_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

0
src/main/resources/assets/superbwarfare/textures/item/mp443_3d.png → src/main/resources/assets/superbwarfare/textures/item/lod/mp_443.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

0
src/main/resources/assets/superbwarfare/textures/item/mp443.png → src/main/resources/assets/superbwarfare/textures/item/mp_443.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

0
src/main/resources/assets/superbwarfare/textures/item/mp443_icon.png → src/main/resources/assets/superbwarfare/textures/item/mp_443_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB