kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

规范化95

Browse source
This commit is contained in:
17146 2025-05-22 00:50:04 +08:00 • committed by Light_Quanta
parent 693276ad75
commit bbd6ba9102
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
17 changed files with 77 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/generated/resources/assets/superbwarfare/models/item/qbz_95.json Normal file
View file

@ -0,0 +1,28 @@
{
"parent": "minecraft:item/generated",
"base": {
"parent": "superbwarfare:item/qbz_95_base"
},
"gui_light": "front",
"loader": "forge:separate_transforms",
"perspectives": {
"fixed": {
"parent": "superbwarfare:lod/qbz_95"
},
"ground": {
"parent": "superbwarfare:lod/qbz_95"
},
"gui": {
"parent": "superbwarfare:item/qbz_95_icon"
},
"head": {
"parent": "superbwarfare:lod/qbz_95"
},
"thirdperson_lefthand": {
"parent": "superbwarfare:lod/qbz_95"
},
"thirdperson_righthand": {
"parent": "superbwarfare:lod/qbz_95"
}
}
}

6
src/generated/resources/assets/superbwarfare/models/item/qbz_95_base.json Normal file
View file

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

6
src/generated/resources/assets/superbwarfare/models/item/qbz_95_icon.json Normal file
View file

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

6
src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java
View file

@ -34,17 +34,17 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
@Override
public ResourceLocation getAnimationResource(Qbz95Item animatable) {
return Mod.loc("animations/qbz95.animation.json");
return Mod.loc("animations/qbz_95.animation.json");
}
@Override
public ResourceLocation getModelResource(Qbz95Item animatable) {
return Mod.loc("geo/qbz95.geo.json");
return Mod.loc("geo/qbz_95.geo.json");
}
@Override
public ResourceLocation getTextureResource(Qbz95Item animatable) {
return Mod.loc("textures/item/qbz95.png");
return Mod.loc("textures/item/qbz_95.png");
}
@Override

1
src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
View file

@ -53,6 +53,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.MOSIN_NAGANT);
gunItem(ModItems.MP_443);
gunItem(ModItems.NTW_20);
gunItem(ModItems.QBZ_95);
simpleItem(ModItems.EMPTY_PERK, "perk/");

32
src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java
View file

@ -57,15 +57,15 @@ public class Qbz95Item extends GunItem implements GeoItem {
if (data.reload.empty()) {
if (drum) {
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_empty_drum_grip"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_empty_drum_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_empty_drum"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_empty_drum"));
}
} else {
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_empty_grip"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_empty_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_empty"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_empty"));
}
}
}
@ -73,35 +73,35 @@ public class Qbz95Item extends GunItem implements GeoItem {
if (data.reload.normal()) {
if (drum) {
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal_drum_grip"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_normal_drum_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal_drum"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_normal_drum"));
}
} else {
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal_grip"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_normal_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.reload_normal"));
}
}
}
if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.run_fast"));
} else {
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.run_grip"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.run_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.run"));
}
}
}
if (grip) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.idle_grip"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.idle_grip"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.idle"));
}
}
@ -112,10 +112,10 @@ public class Qbz95Item extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (ClickHandler.isEditing) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.edit"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.edit"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.idle"));
}
@Override
@ -173,7 +173,7 @@ public class Qbz95Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/qbz95_icon.png");
return Mod.loc("textures/gun_icon/qbz_95_icon.png");
}
@Override

28
src/main/resources/assets/superbwarfare/animations/qbz95.animation.json → src/main/resources/assets/superbwarfare/animations/qbz_95.animation.json
View file

@ -1,10 +1,10 @@
{
"format_version": "1.8.0",
"animations": {
"animation.qbz95.idle": {
"animation.qbz_95.idle": {
"animation_length": 0.5
},
"animation.qbz95.idle_grip": {
"animation.qbz_95.idle_grip": {
"animation_length": 0.5,
"bones": {
"Lefthand": {
@ -13,7 +13,7 @@
}
}
},
"animation.qbz95.edit": {
"animation.qbz_95.edit": {
"loop": "hold_on_last_frame",
"animation_length": 0.4083,
"bones": {
@ -83,7 +83,7 @@
}
}
},
"animation.qbz95.run": {
"animation.qbz_95.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -144,7 +144,7 @@
}
}
},
"animation.qbz95.run_grip": {
"animation.qbz_95.run_grip": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -179,7 +179,7 @@
}
}
},
"animation.qbz95.run_fast": {
"animation.qbz_95.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
@ -247,7 +247,7 @@
}
}
},
"animation.qbz95.reload_empty": {
"animation.qbz_95.reload_empty": {
"loop": "hold_on_last_frame",
"animation_length": 4,
"bones": {
@ -649,7 +649,7 @@
}
}
},
"animation.qbz95.reload_normal": {
"animation.qbz_95.reload_normal": {
"loop": "hold_on_last_frame",
"animation_length": 3,
"bones": {
@ -973,7 +973,7 @@
}
}
},
"animation.qbz95.reload_empty_grip": {
"animation.qbz_95.reload_empty_grip": {
"loop": "hold_on_last_frame",
"animation_length": 4,
"bones": {
@ -1376,7 +1376,7 @@
}
}
},
"animation.qbz95.reload_normal_grip": {
"animation.qbz_95.reload_normal_grip": {
"loop": "hold_on_last_frame",
"animation_length": 3,
"bones": {
@ -1700,7 +1700,7 @@
}
}
},
"animation.qbz95.reload_empty_drum": {
"animation.qbz_95.reload_empty_drum": {
"loop": "hold_on_last_frame",
"animation_length": 4,
"bones": {
@ -2069,7 +2069,7 @@
}
}
},
"animation.qbz95.reload_normal_drum": {
"animation.qbz_95.reload_normal_drum": {
"loop": "hold_on_last_frame",
"animation_length": 3,
"bones": {
@ -2391,7 +2391,7 @@
}
}
},
"animation.qbz95.reload_empty_drum_grip": {
"animation.qbz_95.reload_empty_drum_grip": {
"loop": "hold_on_last_frame",
"animation_length": 4,
"bones": {
@ -2760,7 +2760,7 @@
}
}
},
"animation.qbz95.reload_normal_drum_grip": {
"animation.qbz_95.reload_normal_drum_grip": {
"loop": "hold_on_last_frame",
"animation_length": 3,
"bones": {

2
src/main/resources/assets/superbwarfare/geo/qbz95.geo.json → src/main/resources/assets/superbwarfare/geo/qbz_95.geo.json
View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.unknown",
"identifier": "geometry.qbz_95",
"texture_width": 256,
"texture_height": 256,
"visible_bounds_width": 41,

0
src/main/resources/assets/superbwarfare/models/displaysettings/qbz95.item.json → src/main/resources/assets/superbwarfare/models/displaysettings/qbz_95.item.json
View file

27
src/main/resources/assets/superbwarfare/models/item/qbz_95.json
View file

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

6
src/main/resources/assets/superbwarfare/models/item/qbz_95_base.json
View file

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

6
src/main/resources/assets/superbwarfare/models/item/qbz_95_icon.json
View file

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

4
src/main/resources/assets/superbwarfare/models/item/qbz95_3d.json → src/main/resources/assets/superbwarfare/models/lod/qbz_95.json
View file

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

0
src/main/resources/assets/superbwarfare/textures/gun_icon/qbz95_icon.png → src/main/resources/assets/superbwarfare/textures/gun_icon/qbz_95_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
src/main/resources/assets/superbwarfare/textures/item/qbz95_3d.png → src/main/resources/assets/superbwarfare/textures/item/lod/qbz_95.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

0
src/main/resources/assets/superbwarfare/textures/item/qbz95.png → src/main/resources/assets/superbwarfare/textures/item/qbz_95.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

0
src/main/resources/assets/superbwarfare/textures/item/qbz95_icon.png → src/main/resources/assets/superbwarfare/textures/item/qbz_95_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB