规范化m1911

This commit is contained in:
17146 2025-05-21 22:00:58 +08:00 committed by Light_Quanta
parent c1c440132e
commit 2f6392d94e
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
17 changed files with 57 additions and 52 deletions

View file

@ -1,4 +1,4 @@
// 1.21.1 2025-05-21T23:19:47.6644332 Item Models: superbwarfare
// 1.21.1 2025-05-21T23:37:51.9812731 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
@ -121,7 +121,10 @@ ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json
4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.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
abfc41b0ce81fa4107c892db89d2f7aef54b9cf5 assets/superbwarfare/models/item/m_1911_icon.json
6e140a5076d9eb4787c0ea14ef3dedc87825dde6 assets/superbwarfare/models/item/m_4.json
516a430e688e26c4f02bded1113b7bd8c133dcef assets/superbwarfare/models/item/m_4_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_4_blueprint.json

View file

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

View file

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

View file

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

View file

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

View file

@ -44,6 +44,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.M_4);
gunItem(ModItems.M_60);
gunItem(ModItems.M_79);
gunItem(ModItems.M_1911);
simpleItem(ModItems.EMPTY_PERK, "perk/");

View file

@ -50,14 +50,14 @@ public class M1911Item 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.glock_17.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.glock_17.reload_normal"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle"));
}
private PlayState idlePredicate(AnimationState<M1911Item> event) {
@ -70,13 +70,13 @@ public class M1911Item 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.glock_17.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle"));
}
@Override
@ -102,7 +102,7 @@ public class M1911Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/m1911_icon.png");
return Mod.loc("textures/gun_icon/m_1911_icon.png");
}
@Override

View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.m1911",
"identifier": "geometry.m_1911",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 126,

View file

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

View file

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

View file

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

View file

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

View file

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 385 B

View file

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View file

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB