规范化abk

This commit is contained in:
17146 2025-05-21 19:46:42 +08:00 committed by Light_Quanta
parent 87e37b9ce7
commit 74c46e8a0d
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
11 changed files with 53 additions and 42 deletions

View file

@ -1,4 +1,4 @@
// 1.21.1 2025-05-21T21:33:50.228816 Item Models: superbwarfare // 1.21.1 2025-05-21T21:35:27.2725955 Item Models: superbwarfare
6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json
fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
@ -71,6 +71,9 @@ d23520b099cb796401635fe75b5b852fc957d4ea assets/superbwarfare/models/item/high_e
3d1384927659fd860ed7b10eece61837202bf5f8 assets/superbwarfare/models/item/hk_416_base.json 3d1384927659fd860ed7b10eece61837202bf5f8 assets/superbwarfare/models/item/hk_416_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json
954f6b04fea509ed4572b15810f79364dfb0e63a assets/superbwarfare/models/item/hk_416_icon.json 954f6b04fea509ed4572b15810f79364dfb0e63a assets/superbwarfare/models/item/hk_416_icon.json
f98cf49f8dea452a0fcc9bfc8fe9d02dcaa1a564 assets/superbwarfare/models/item/homemade_shotgun.json
3bce212de9120457cba07ffb5214d45af88d191b assets/superbwarfare/models/item/homemade_shotgun_base.json
d7d1a02a23157105ef8691ad0eba016f0af92ab7 assets/superbwarfare/models/item/homemade_shotgun_icon.json
a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11_blueprint.json a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/insidious_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/insidious_blueprint.json

View file

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

View file

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

View file

@ -36,6 +36,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.GLOCK_17); gunItem(ModItems.GLOCK_17);
gunItem(ModItems.GLOCK_18, "glock_17"); gunItem(ModItems.GLOCK_18, "glock_17");
gunItem(ModItems.HK_416); gunItem(ModItems.HK_416);
gunItem(ModItems.HOMEMADE_SHOTGUN);
simpleItem(ModItems.EMPTY_PERK, "perk/"); simpleItem(ModItems.EMPTY_PERK, "perk/");

View file

@ -74,22 +74,22 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (GunData.from(stack).reload.empty()) { if (GunData.from(stack).reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_empty")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.homemade_shotgun.reload_empty"));
} }
if (GunData.from(stack).reload.normal()) { if (GunData.from(stack).reload.normal()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.homemade_shotgun.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) { if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
if (ClientEventHandler.tacticalSprint) { if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.homemade_shotgun.run_fast"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.homemade_shotgun.run"));
} }
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.homemade_shotgun.idle"));
} }
@Override @Override

View file

@ -1,7 +1,7 @@
{ {
"format_version": "1.8.0", "format_version": "1.8.0",
"animations": { "animations": {
"animation.ab.idle": { "animation.homemade_shotgun.idle": {
"loop": true, "loop": true,
"animation_length": 2, "animation_length": 2,
"bones": { "bones": {
@ -20,7 +20,7 @@
} }
} }
}, },
"animation.ab.draw": { "animation.homemade_shotgun.draw": {
"animation_length": 0.6, "animation_length": 0.6,
"bones": { "bones": {
"0": { "0": {
@ -71,7 +71,7 @@
} }
} }
}, },
"animation.ab.run": { "animation.homemade_shotgun.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
"bones": { "bones": {
@ -154,7 +154,7 @@
} }
} }
}, },
"animation.ab.run_fast": { "animation.homemade_shotgun.run_fast": {
"loop": true, "loop": true,
"animation_length": 0.6, "animation_length": 0.6,
"bones": { "bones": {
@ -237,7 +237,7 @@
} }
} }
}, },
"animation.ab.fire": { "animation.homemade_shotgun.fire": {
"animation_length": 0.1, "animation_length": 0.1,
"bones": { "bones": {
"0": { "0": {
@ -263,7 +263,7 @@
} }
} }
}, },
"animation.ab.reload_normal": { "animation.homemade_shotgun.reload_normal": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 3.3, "animation_length": 3.3,
"bones": { "bones": {
@ -715,7 +715,7 @@
} }
} }
}, },
"animation.ab.reload_empty": { "animation.homemade_shotgun.reload_empty": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 4.2, "animation_length": 4.2,
"bones": { "bones": {

View file

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

View file

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB