规范化ak47

This commit is contained in:
17146 2025-05-21 18:18:25 +08:00 committed by Light_Quanta
parent 58c552bae4
commit 969dac4f5c
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
27 changed files with 102 additions and 97 deletions

View file

@ -1,4 +1,4 @@
// 1.21.1 2025-05-21T21:21:58.5575482 Item Models: superbwarfare // 1.21.1 2025-05-21T21:23:33.5005638 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
@ -9,7 +9,10 @@ eee5935baee9a6a78e6576735736512f528eb4db assets/superbwarfare/models/item/aa_12_
1016f92876debab22fdaa67312d2c2f0683195e1 assets/superbwarfare/models/item/ak_12_base.json 1016f92876debab22fdaa67312d2c2f0683195e1 assets/superbwarfare/models/item/ak_12_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json
0843d7b6ebb6269746e030ddd49c17cc4715c77b assets/superbwarfare/models/item/ak_12_icon.json 0843d7b6ebb6269746e030ddd49c17cc4715c77b assets/superbwarfare/models/item/ak_12_icon.json
01ac6ff8a9ea2b41375ef94e3106f5938b51a486 assets/superbwarfare/models/item/ak_47.json
4ef5e4d3bc5841b22d0b9a489a3bffcf89e28370 assets/superbwarfare/models/item/ak_47_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json
cc89259ebe38851498eecddf4448aa13ba7053db assets/superbwarfare/models/item/ak_47_icon.json
c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json
a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/annihilator_blueprint.json a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/annihilator_blueprint.json
4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json 4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json

View file

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

View file

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

View file

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

View file

@ -27,7 +27,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
@Override @Override
public ResourceLocation getAnimationResource(AK47Item animatable) { public ResourceLocation getAnimationResource(AK47Item animatable) {
return Mod.loc("animations/ak.animation.json"); return Mod.loc("animations/ak_47.animation.json");
} }
@Override @Override
@ -37,7 +37,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
@Override @Override
public ResourceLocation getTextureResource(AK47Item animatable) { public ResourceLocation getTextureResource(AK47Item animatable) {
return Mod.loc("textures/item/ak47.png"); return Mod.loc("textures/item/ak_47.png");
} }
@Override @Override

View file

@ -24,7 +24,7 @@ public class RpkItemModel extends GeoModel<RpkItem> {
@Override @Override
public ResourceLocation getAnimationResource(RpkItem animatable) { public ResourceLocation getAnimationResource(RpkItem animatable) {
return Mod.loc("animations/ak.animation.json"); return Mod.loc("animations/ak_47.animation.json");
} }
@Override @Override

View file

@ -29,6 +29,7 @@ public class ModItemModelProvider extends ItemModelProvider {
// gun // gun
gunItem(ModItems.AA_12); gunItem(ModItems.AA_12);
gunItem(ModItems.AK_12); gunItem(ModItems.AK_12);
gunItem(ModItems.AK_47);
gunItem(ModItems.AURELIA_SCEPTRE); gunItem(ModItems.AURELIA_SCEPTRE);
simpleItem(ModItems.EMPTY_PERK, "perk/"); simpleItem(ModItems.EMPTY_PERK, "perk/");

View file

@ -55,15 +55,15 @@ public class RpkItem extends GunItem implements GeoItem {
if (GunData.from(stack).reload.empty()) { if (GunData.from(stack).reload.empty()) {
if (drum) { if (drum) {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_drum_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_drum_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_drum")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_drum"));
} }
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty"));
} }
} }
} }
@ -71,35 +71,35 @@ public class RpkItem extends GunItem implements GeoItem {
if (GunData.from(stack).reload.normal()) { if (GunData.from(stack).reload.normal()) {
if (drum) { if (drum) {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_drum_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_drum_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_drum")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_drum"));
} }
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.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.ak47.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.run_fast"));
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.run_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.run_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.run"));
} }
} }
} }
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle_grip")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle"));
} }
} }
@ -110,10 +110,10 @@ public class RpkItem extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (ClickHandler.isEditing) { if (ClickHandler.isEditing) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.edit")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.edit"));
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle"));
} }
@Override @Override

View file

@ -63,15 +63,15 @@ public class AK47Item extends GunItem implements GeoItem {
if (GunData.from(stack).reload.empty()) { if (GunData.from(stack).reload.empty()) {
if (drum) { if (drum) {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_drum_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_drum_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_drum")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_drum"));
} }
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_empty"));
} }
} }
} }
@ -79,35 +79,35 @@ public class AK47Item extends GunItem implements GeoItem {
if (GunData.from(stack).reload.normal()) { if (GunData.from(stack).reload.normal()) {
if (drum) { if (drum) {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_drum_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_drum_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_drum")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_drum"));
} }
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.reload_normal_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.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.ak47.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.run_fast"));
} else { } else {
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.run_grip")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.run_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.run"));
} }
} }
} }
if (grip) { if (grip) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle_grip")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle_grip"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle"));
} }
} }
@ -118,10 +118,10 @@ public class AK47Item extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (ClickHandler.isEditing) { if (ClickHandler.isEditing) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.edit")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_47.edit"));
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_47.idle"));
} }
@Override @Override

View file

@ -1,10 +1,10 @@
{ {
"format_version": "1.8.0", "format_version": "1.8.0",
"animations": { "animations": {
"animation.ak47.idle": { "animation.ak_47.idle": {
"animation_length": 1 "animation_length": 1
}, },
"animation.ak47.edit": { "animation.ak_47.edit": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 0.4083, "animation_length": 0.4083,
"bones": { "bones": {
@ -38,7 +38,7 @@
} }
} }
}, },
"animation.ak47.run": { "animation.ak_47.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
"bones": { "bones": {
@ -69,7 +69,7 @@
} }
} }
}, },
"animation.ak47.run_fast": { "animation.ak_47.run_fast": {
"loop": true, "loop": true,
"animation_length": 0.7, "animation_length": 0.7,
"bones": { "bones": {
@ -104,7 +104,7 @@
} }
} }
}, },
"animation.ak47.reload_normal": { "animation.ak_47.reload_normal": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2.6833, "animation_length": 2.6833,
"override_previous_animation": true, "override_previous_animation": true,
@ -542,7 +542,7 @@
} }
} }
}, },
"animation.ak47.reload_normal_drum": { "animation.ak_47.reload_normal_drum": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2.6833, "animation_length": 2.6833,
"override_previous_animation": true, "override_previous_animation": true,
@ -980,7 +980,7 @@
} }
} }
}, },
"animation.ak47.reload_empty": { "animation.ak_47.reload_empty": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 3.4, "animation_length": 3.4,
"override_previous_animation": true, "override_previous_animation": true,
@ -1472,7 +1472,7 @@
} }
} }
}, },
"animation.ak47.reload_empty_drum": { "animation.ak_47.reload_empty_drum": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 3.4, "animation_length": 3.4,
"override_previous_animation": true, "override_previous_animation": true,
@ -1972,7 +1972,7 @@
} }
} }
}, },
"animation.ak47.idle_grip": { "animation.ak_47.idle_grip": {
"animation_length": 7.2667, "animation_length": 7.2667,
"bones": { "bones": {
"Lefthand": { "Lefthand": {
@ -1981,7 +1981,7 @@
} }
} }
}, },
"animation.ak47.reload_normal_grip": { "animation.ak_47.reload_normal_grip": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2.75, "animation_length": 2.75,
"override_previous_animation": true, "override_previous_animation": true,
@ -2419,7 +2419,7 @@
} }
} }
}, },
"animation.ak47.reload_normal_drum_grip": { "animation.ak_47.reload_normal_drum_grip": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2.6833, "animation_length": 2.6833,
"override_previous_animation": true, "override_previous_animation": true,
@ -2857,7 +2857,7 @@
} }
} }
}, },
"animation.ak47.run_grip": { "animation.ak_47.run_grip": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
"bones": { "bones": {
@ -2892,7 +2892,7 @@
} }
} }
}, },
"animation.ak47.reload_empty_grip": { "animation.ak_47.reload_empty_grip": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 3.4, "animation_length": 3.4,
"override_previous_animation": true, "override_previous_animation": true,
@ -3384,7 +3384,7 @@
} }
} }
}, },
"animation.ak47.reload_empty_drum_grip": { "animation.ak_47.reload_empty_drum_grip": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 3.4, "animation_length": 3.4,
"override_previous_animation": true, "override_previous_animation": true,

View file

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

View file

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

View file

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

View file

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

View file

@ -1,5 +1,5 @@
{ {
"parent": "superbwarfare:displaysettings/ak47.item", "parent": "superbwarfare:displaysettings/ak_47.item",
"textures": { "textures": {
"layer0": "superbwarfare:item/rpk" "layer0": "superbwarfare:item/rpk"
} }

View file

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

View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"texture_size": [32, 32], "texture_size": [32, 32],
"textures": { "textures": {
"1": "superbwarfare:item/lod/ak_12" "1": "superbwarfare:lod/ak_12"
}, },
"elements": [ "elements": [
{ {

View file

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

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/lod/aurelia_sceptre", "0": "superbwarfare:lod/aurelia_sceptre",
"particle": "superbwarfare:item/lod/aurelia_sceptre" "particle": "superbwarfare:lod/aurelia_sceptre"
}, },
"elements": [ "elements": [
{ {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 B

View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View file

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View file

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B

View file

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 337 B

View file

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B