优化aa12的命名 优化模型位置分组

This commit is contained in:
17146 2025-05-21 17:53:12 +08:00 committed by Light_Quanta
parent c575c5ce81
commit a279cf9bbb
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
22 changed files with 3139 additions and 16621 deletions

View file

@ -1,5 +1,8 @@
// 1.21.1 2025-05-21T21:13:24.0760608 Item Models: superbwarfare // 1.21.1 2025-05-21T21:19:03.1904953 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 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
eee5935baee9a6a78e6576735736512f528eb4db assets/superbwarfare/models/item/aa_12_icon.json
0a9bfb695c2b5668863a2de4770f5bfca663c1dc assets/superbwarfare/models/item/agm.json 0a9bfb695c2b5668863a2de4770f5bfca663c1dc assets/superbwarfare/models/item/agm.json
29ad5daadcdf7c10771fc45b649c527d16325cbb assets/superbwarfare/models/item/aircraft_catapult.json 29ad5daadcdf7c10771fc45b649c527d16325cbb assets/superbwarfare/models/item/aircraft_catapult.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json

View file

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

View file

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

View file

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

View file

@ -19,17 +19,17 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
@Override @Override
public ResourceLocation getAnimationResource(Aa12Item animatable) { public ResourceLocation getAnimationResource(Aa12Item animatable) {
return Mod.loc("animations/aa12.animation.json"); return Mod.loc("animations/aa_12.animation.json");
} }
@Override @Override
public ResourceLocation getModelResource(Aa12Item animatable) { public ResourceLocation getModelResource(Aa12Item animatable) {
return Mod.loc("geo/aa12.geo.json"); return Mod.loc("geo/aa_12.geo.json");
} }
@Override @Override
public ResourceLocation getTextureResource(Aa12Item animatable) { public ResourceLocation getTextureResource(Aa12Item animatable) {
return Mod.loc("textures/item/aa12_new.png"); return Mod.loc("textures/item/aa_12.png");
} }
@Override @Override

View file

@ -26,7 +26,8 @@ public class ModItemModelProvider extends ItemModelProvider {
@Override @Override
protected void registerModels() { protected void registerModels() {
// test // gun
gunItem(ModItems.AA_12);
gunItem(ModItems.AURELIA_SCEPTRE); gunItem(ModItems.AURELIA_SCEPTRE);
simpleItem(ModItems.EMPTY_PERK, "perk/"); simpleItem(ModItems.EMPTY_PERK, "perk/");

View file

@ -54,22 +54,22 @@ public class Aa12Item extends GunItem implements GeoItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (GunData.from(stack).reload.empty()) { if (GunData.from(stack).reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_empty")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa_12.reload_empty"));
} }
if (GunData.from(stack).reload.normal()) { if (GunData.from(stack).reload.normal()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa_12.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.aa12.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.run_fast"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.run"));
} }
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.idle"));
} }
return PlayState.STOP; return PlayState.STOP;
} }

View file

@ -1,7 +1,7 @@
{ {
"format_version": "1.8.0", "format_version": "1.8.0",
"animations": { "animations": {
"animation.aa12.idle": { "animation.aa_12.idle": {
"loop": true, "loop": true,
"animation_length": 0.25, "animation_length": 0.25,
"bones": { "bones": {
@ -12,7 +12,7 @@
} }
} }
}, },
"animation.aa12.run": { "animation.aa_12.run": {
"loop": true, "loop": true,
"animation_length": 0.7917, "animation_length": 0.7917,
"bones": { "bones": {
@ -80,7 +80,7 @@
} }
} }
}, },
"animation.aa12.run_fast": { "animation.aa_12.run_fast": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
"bones": { "bones": {
@ -157,10 +157,10 @@
} }
} }
}, },
"animation.aa12.fire": { "animation.aa_12.fire": {
"animation_length": 0.125 "animation_length": 0.125
}, },
"animation.aa12.reload_empty": { "animation.aa_12.reload_empty": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 4.1167, "animation_length": 4.1167,
"bones": { "bones": {
@ -593,7 +593,7 @@
} }
} }
}, },
"animation.aa12.reload_normal": { "animation.aa_12.reload_normal": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2.9667, "animation_length": 2.9667,
"bones": { "bones": {

View file

@ -3,7 +3,7 @@
"minecraft:geometry": [ "minecraft:geometry": [
{ {
"description": { "description": {
"identifier": "geometry.aa12", "identifier": "geometry.aa_12",
"texture_width": 256, "texture_width": 256,
"texture_height": 256, "texture_height": 256,
"visible_bounds_width": 9, "visible_bounds_width": 9,

View file

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

View file

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

View file

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

View file

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

View file

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

View file

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B