规范化ak12
|
@ -1,11 +1,14 @@
|
|||
// 1.21.1 2025-05-21T21:19:03.1904953 Item Models: superbwarfare
|
||||
// 1.21.1 2025-05-21T21:21:58.5575482 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
|
||||
eee5935baee9a6a78e6576735736512f528eb4db assets/superbwarfare/models/item/aa_12_icon.json
|
||||
0a9bfb695c2b5668863a2de4770f5bfca663c1dc assets/superbwarfare/models/item/agm.json
|
||||
29ad5daadcdf7c10771fc45b649c527d16325cbb assets/superbwarfare/models/item/aircraft_catapult.json
|
||||
669f3f22023bb6e2cc34b3b522235f5847afd8d1 assets/superbwarfare/models/item/ak_12.json
|
||||
1016f92876debab22fdaa67312d2c2f0683195e1 assets/superbwarfare/models/item/ak_12_base.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json
|
||||
0843d7b6ebb6269746e030ddd49c17cc4715c77b assets/superbwarfare/models/item/ak_12_icon.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json
|
||||
c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json
|
||||
a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/annihilator_blueprint.json
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"base": {
|
||||
"parent": "superbwarfare:item/ak_12_base"
|
||||
},
|
||||
"gui_light": "front",
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"perspectives": {
|
||||
"fixed": {
|
||||
"parent": "superbwarfare:lod/ak_12"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "superbwarfare:lod/ak_12"
|
||||
},
|
||||
"gui": {
|
||||
"parent": "superbwarfare:item/ak_12_icon"
|
||||
},
|
||||
"head": {
|
||||
"parent": "superbwarfare:lod/ak_12"
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"parent": "superbwarfare:lod/ak_12"
|
||||
},
|
||||
"thirdperson_righthand": {
|
||||
"parent": "superbwarfare:lod/ak_12"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "superbwarfare:displaysettings/ak_12.item",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/ak_12"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/ak_12_icon"
|
||||
}
|
||||
}
|
|
@ -27,17 +27,17 @@ public class AK12ItemModel extends GeoModel<AK12Item> {
|
|||
|
||||
@Override
|
||||
public ResourceLocation getAnimationResource(AK12Item animatable) {
|
||||
return Mod.loc("animations/ak12.animation.json");
|
||||
return Mod.loc("animations/ak_12.animation.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getModelResource(AK12Item animatable) {
|
||||
return Mod.loc("geo/ak12.geo.json");
|
||||
return Mod.loc("geo/ak_12.geo.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureResource(AK12Item animatable) {
|
||||
return Mod.loc("textures/item/ak12.png");
|
||||
return Mod.loc("textures/item/ak_12.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -28,6 +28,7 @@ public class ModItemModelProvider extends ItemModelProvider {
|
|||
protected void registerModels() {
|
||||
// gun
|
||||
gunItem(ModItems.AA_12);
|
||||
gunItem(ModItems.AK_12);
|
||||
gunItem(ModItems.AURELIA_SCEPTRE);
|
||||
|
||||
simpleItem(ModItems.EMPTY_PERK, "perk/");
|
||||
|
@ -242,7 +243,7 @@ public class ModItemModelProvider extends ItemModelProvider {
|
|||
.end();
|
||||
}
|
||||
|
||||
private void gunItem(DeferredHolder<Item, ? extends Item> item) {
|
||||
public void gunItem(DeferredHolder<Item, ? extends Item> item) {
|
||||
this.gunIcon(item);
|
||||
this.gunBase(item);
|
||||
this.customSeparatedGunModel(item);
|
||||
|
|
|
@ -62,44 +62,44 @@ public class AK12Item extends GunItem implements GeoItem {
|
|||
|
||||
if (GunData.from(stack).reload.empty()) {
|
||||
if (grip) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_empty_grip"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_empty_grip"));
|
||||
} else {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_empty"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_empty"));
|
||||
}
|
||||
}
|
||||
|
||||
if (GunData.from(stack).reload.normal()) {
|
||||
if (drum) {
|
||||
if (grip) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal_drum_grip"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_normal_drum_grip"));
|
||||
} else {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal_drum"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_normal_drum"));
|
||||
}
|
||||
} else {
|
||||
if (grip) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal_grip"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_normal_grip"));
|
||||
} else {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.reload_normal"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
|
||||
if (ClientEventHandler.tacticalSprint) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.run_fast"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.run_fast"));
|
||||
} else {
|
||||
if (grip) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.run_grip"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.run_grip"));
|
||||
} else {
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.run"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.run"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (grip) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.idle_grip"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.idle_grip"));
|
||||
} else {
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.idle"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.idle"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -110,10 +110,10 @@ public class AK12Item extends GunItem implements GeoItem {
|
|||
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
|
||||
|
||||
if (ClickHandler.isEditing) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.edit"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.edit"));
|
||||
}
|
||||
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.idle"));
|
||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.idle"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -156,7 +156,7 @@ public class AK12Item extends GunItem implements GeoItem {
|
|||
|
||||
@Override
|
||||
public ResourceLocation getGunIcon() {
|
||||
return Mod.loc("textures/gun_icon/ak12_icon.png");
|
||||
return Mod.loc("textures/gun_icon/ak_12_icon.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"format_version": "1.8.0",
|
||||
"animations": {
|
||||
"animation.ak12.idle": {
|
||||
"animation.ak_12.idle": {
|
||||
"animation_length": 1
|
||||
},
|
||||
"animation.ak12.edit": {
|
||||
"animation.ak_12.edit": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 0.4083,
|
||||
"bones": {
|
||||
|
@ -38,7 +38,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.run": {
|
||||
"animation.ak_12.run": {
|
||||
"loop": true,
|
||||
"animation_length": 0.8,
|
||||
"bones": {
|
||||
|
@ -69,7 +69,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.run_fast": {
|
||||
"animation.ak_12.run_fast": {
|
||||
"loop": true,
|
||||
"animation_length": 0.7,
|
||||
"bones": {
|
||||
|
@ -104,7 +104,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_normal": {
|
||||
"animation.ak_12.reload_normal": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.6833,
|
||||
"override_previous_animation": true,
|
||||
|
@ -542,7 +542,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_normal_drum": {
|
||||
"animation.ak_12.reload_normal_drum": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.6833,
|
||||
"override_previous_animation": true,
|
||||
|
@ -980,7 +980,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_empty": {
|
||||
"animation.ak_12.reload_empty": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.9,
|
||||
"override_previous_animation": true,
|
||||
|
@ -1325,7 +1325,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.idle_grip": {
|
||||
"animation.ak_12.idle_grip": {
|
||||
"animation_length": 1,
|
||||
"bones": {
|
||||
"Lefthand": {
|
||||
|
@ -1334,7 +1334,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.run_grip": {
|
||||
"animation.ak_12.run_grip": {
|
||||
"loop": true,
|
||||
"animation_length": 0.8,
|
||||
"bones": {
|
||||
|
@ -1369,7 +1369,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_normal_grip": {
|
||||
"animation.ak_12.reload_normal_grip": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.75,
|
||||
"override_previous_animation": true,
|
||||
|
@ -1807,7 +1807,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_normal_drum_grip": {
|
||||
"animation.ak_12.reload_normal_drum_grip": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.6833,
|
||||
"override_previous_animation": true,
|
||||
|
@ -2245,7 +2245,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"animation.ak12.reload_empty_grip": {
|
||||
"animation.ak_12.reload_empty_grip": {
|
||||
"loop": "hold_on_last_frame",
|
||||
"animation_length": 2.9,
|
||||
"override_previous_animation": true,
|
|
@ -3,7 +3,7 @@
|
|||
"minecraft:geometry": [
|
||||
{
|
||||
"description": {
|
||||
"identifier": "geometry.ak12",
|
||||
"identifier": "geometry.ak_12",
|
||||
"texture_width": 128,
|
||||
"texture_height": 128,
|
||||
"visible_bounds_width": 29,
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/aa_12"
|
||||
}
|
||||
}
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "superbwarfare:item/ak_12_base"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "superbwarfare:item/ak_12_icon"
|
||||
},
|
||||
"thirdperson_righthand": {
|
||||
"parent": "superbwarfare:item/ak_123d"
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"parent": "superbwarfare:item/ak_123d"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "superbwarfare:item/ak_123d"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "superbwarfare:item/ak_123d"
|
||||
},
|
||||
"head": {
|
||||
"parent": "superbwarfare:item/ak_123d"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "superbwarfare:displaysettings/ak12.item",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/ak12"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/ak12_icon"
|
||||
}
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
"credit": "Made with Blockbench",
|
||||
"texture_size": [32, 32],
|
||||
"textures": {
|
||||
"1": "superbwarfare:item/ak12_3d"
|
||||
"1": "superbwarfare:item/lod/ak_12"
|
||||
},
|
||||
"elements": [
|
||||
{
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 337 B |