规范化95
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "superbwarfare:displaysettings/qbz_95.item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "superbwarfare:item/qbz_95"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "superbwarfare:item/qbz_95_icon"
|
||||||
|
}
|
||||||
|
}
|
|
@ -34,17 +34,17 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getAnimationResource(Qbz95Item animatable) {
|
public ResourceLocation getAnimationResource(Qbz95Item animatable) {
|
||||||
return Mod.loc("animations/qbz95.animation.json");
|
return Mod.loc("animations/qbz_95.animation.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getModelResource(Qbz95Item animatable) {
|
public ResourceLocation getModelResource(Qbz95Item animatable) {
|
||||||
return Mod.loc("geo/qbz95.geo.json");
|
return Mod.loc("geo/qbz_95.geo.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getTextureResource(Qbz95Item animatable) {
|
public ResourceLocation getTextureResource(Qbz95Item animatable) {
|
||||||
return Mod.loc("textures/item/qbz95.png");
|
return Mod.loc("textures/item/qbz_95.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -53,6 +53,7 @@ public class ModItemModelProvider extends ItemModelProvider {
|
||||||
gunItem(ModItems.MOSIN_NAGANT);
|
gunItem(ModItems.MOSIN_NAGANT);
|
||||||
gunItem(ModItems.MP_443);
|
gunItem(ModItems.MP_443);
|
||||||
gunItem(ModItems.NTW_20);
|
gunItem(ModItems.NTW_20);
|
||||||
|
gunItem(ModItems.QBZ_95);
|
||||||
|
|
||||||
simpleItem(ModItems.EMPTY_PERK, "perk/");
|
simpleItem(ModItems.EMPTY_PERK, "perk/");
|
||||||
|
|
||||||
|
|
|
@ -57,15 +57,15 @@ public class Qbz95Item extends GunItem implements GeoItem {
|
||||||
if (data.reload.empty()) {
|
if (data.reload.empty()) {
|
||||||
if (drum) {
|
if (drum) {
|
||||||
if (grip) {
|
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 {
|
} 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 {
|
} else {
|
||||||
if (grip) {
|
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 {
|
} 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 (data.reload.normal()) {
|
||||||
if (drum) {
|
if (drum) {
|
||||||
if (grip) {
|
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 {
|
} 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 {
|
} else {
|
||||||
if (grip) {
|
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 {
|
} 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 (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
|
||||||
if (ClientEventHandler.tacticalSprint) {
|
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 {
|
} else {
|
||||||
if (grip) {
|
if (grip) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.run_grip"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz_95.run_grip"));
|
||||||
} else {
|
} else {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.run"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.run"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (grip) {
|
if (grip) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.idle_grip"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz_95.idle_grip"));
|
||||||
} else {
|
} 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 (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
|
||||||
|
|
||||||
if (ClickHandler.isEditing) {
|
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
|
@Override
|
||||||
|
@ -173,7 +173,7 @@ public class Qbz95Item extends GunItem implements GeoItem {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getGunIcon() {
|
public ResourceLocation getGunIcon() {
|
||||||
return Mod.loc("textures/gun_icon/qbz95_icon.png");
|
return Mod.loc("textures/gun_icon/qbz_95_icon.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
"format_version": "1.8.0",
|
"format_version": "1.8.0",
|
||||||
"animations": {
|
"animations": {
|
||||||
"animation.qbz95.idle": {
|
"animation.qbz_95.idle": {
|
||||||
"animation_length": 0.5
|
"animation_length": 0.5
|
||||||
},
|
},
|
||||||
"animation.qbz95.idle_grip": {
|
"animation.qbz_95.idle_grip": {
|
||||||
"animation_length": 0.5,
|
"animation_length": 0.5,
|
||||||
"bones": {
|
"bones": {
|
||||||
"Lefthand": {
|
"Lefthand": {
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.edit": {
|
"animation.qbz_95.edit": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 0.4083,
|
"animation_length": 0.4083,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.run": {
|
"animation.qbz_95.run": {
|
||||||
"loop": true,
|
"loop": true,
|
||||||
"animation_length": 0.8,
|
"animation_length": 0.8,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.run_grip": {
|
"animation.qbz_95.run_grip": {
|
||||||
"loop": true,
|
"loop": true,
|
||||||
"animation_length": 0.8,
|
"animation_length": 0.8,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -179,7 +179,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.run_fast": {
|
"animation.qbz_95.run_fast": {
|
||||||
"loop": true,
|
"loop": true,
|
||||||
"animation_length": 0.7,
|
"animation_length": 0.7,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -247,7 +247,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_empty": {
|
"animation.qbz_95.reload_empty": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 4,
|
"animation_length": 4,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -649,7 +649,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_normal": {
|
"animation.qbz_95.reload_normal": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 3,
|
"animation_length": 3,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -973,7 +973,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_empty_grip": {
|
"animation.qbz_95.reload_empty_grip": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 4,
|
"animation_length": 4,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -1376,7 +1376,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_normal_grip": {
|
"animation.qbz_95.reload_normal_grip": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 3,
|
"animation_length": 3,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -1700,7 +1700,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_empty_drum": {
|
"animation.qbz_95.reload_empty_drum": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 4,
|
"animation_length": 4,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -2069,7 +2069,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_normal_drum": {
|
"animation.qbz_95.reload_normal_drum": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 3,
|
"animation_length": 3,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -2391,7 +2391,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_empty_drum_grip": {
|
"animation.qbz_95.reload_empty_drum_grip": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 4,
|
"animation_length": 4,
|
||||||
"bones": {
|
"bones": {
|
||||||
|
@ -2760,7 +2760,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"animation.qbz95.reload_normal_drum_grip": {
|
"animation.qbz_95.reload_normal_drum_grip": {
|
||||||
"loop": "hold_on_last_frame",
|
"loop": "hold_on_last_frame",
|
||||||
"animation_length": 3,
|
"animation_length": 3,
|
||||||
"bones": {
|
"bones": {
|
|
@ -3,7 +3,7 @@
|
||||||
"minecraft:geometry": [
|
"minecraft:geometry": [
|
||||||
{
|
{
|
||||||
"description": {
|
"description": {
|
||||||
"identifier": "geometry.unknown",
|
"identifier": "geometry.qbz_95",
|
||||||
"texture_width": 256,
|
"texture_width": 256,
|
||||||
"texture_height": 256,
|
"texture_height": 256,
|
||||||
"visible_bounds_width": 41,
|
"visible_bounds_width": 41,
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "superbwarfare:displaysettings/qbz95.item",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "superbwarfare:item/qbz95"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "superbwarfare:item/qbz95_icon"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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/qbz95_3d",
|
"0": "superbwarfare:item/lod/qbz_95",
|
||||||
"particle": "superbwarfare:item/qbz95_3d"
|
"particle": "superbwarfare:item/lod/qbz_95"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |