规范化二次灾变

This commit is contained in:
17146 2025-05-22 01:55:48 +08:00 committed by Light_Quanta
parent 9f34ec110a
commit 27e3be6898
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
9 changed files with 48 additions and 46 deletions

View file

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

View file

@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "superbwarfare:item/secondary_cataclysm_icon"
}

View file

@ -56,6 +56,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.QBZ_95);
gunItem(ModItems.RPG);
gunItem(ModItems.RPK);
gunItem(ModItems.SECONDARY_CATACLYSM);
simpleItem(ModItems.EMPTY_PERK, "perk/");

View file

@ -79,26 +79,26 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag
var data = GunData.from(stack);
if (data.reload.stage() == 1 && data.reload.prepareLoadTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.prepare"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.prepare"));
}
if (data.loadIndex.get() == 0 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.iterativeload"));
}
if (data.loadIndex.get() == 1 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload2"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.iterativeload2"));
}
if (ClientEventHandler.gunMelee > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.hit"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.hit"));
}
if (data.reload.stage() == 3) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.finish"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.finish"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.idle"));
}
private PlayState idlePredicate(AnimationState<SecondaryCataclysm> event) {
@ -119,13 +119,13 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag
&& !data.reloading()
) {
if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.idle"));
}
@Override

View file

@ -1,10 +1,10 @@
{
"format_version": "1.8.0",
"animations": {
"animation.sc.idle": {
"animation.secondary_cataclysm.idle": {
"loop": true
},
"animation.sc.run": {
"animation.secondary_cataclysm.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -56,7 +56,7 @@
}
}
},
"animation.sc.run_fast": {
"animation.secondary_cataclysm.run_fast": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -117,7 +117,7 @@
}
}
},
"animation.sc.prepare": {
"animation.secondary_cataclysm.prepare": {
"loop": "hold_on_last_frame",
"animation_length": 1.6,
"bones": {
@ -410,7 +410,7 @@
}
}
},
"animation.sc.iterativeload": {
"animation.secondary_cataclysm.iterativeload": {
"loop": true,
"animation_length": 1,
"bones": {
@ -642,7 +642,7 @@
}
}
},
"animation.sc.iterativeload2": {
"animation.secondary_cataclysm.iterativeload2": {
"loop": true,
"animation_length": 1,
"bones": {
@ -874,7 +874,7 @@
}
}
},
"animation.sc.finish": {
"animation.secondary_cataclysm.finish": {
"loop": "hold_on_last_frame",
"animation_length": 1,
"bones": {
@ -1040,7 +1040,7 @@
}
}
},
"animation.sc.hit": {
"animation.secondary_cataclysm.hit": {
"animation_length": 1,
"bones": {
"0": {

View file

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

View file

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