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

规范化m870

Browse source
This commit is contained in:
17146 2025-05-21 22:48:33 +08:00 • committed by Light_Quanta
parent 2f6392d94e
commit ed6d563118
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
18 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
View file

@ -1,4 +1,4 @@
// 1.21.1 2025-05-21T23:37:51.9812731 Item Models: superbwarfare
// 1.21.1 2025-05-21T23:39:01.6719818 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
@ -137,7 +137,10 @@ e141044945c8a873fc0df3dcf9e7a486726c0807 assets/superbwarfare/models/item/m_60_i
6c66b12b6402a01d28c5e514c04ba8fb3d23519b assets/superbwarfare/models/item/m_79_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_79_blueprint.json
a16e65b4895406036d6348e601f1520f994b3795 assets/superbwarfare/models/item/m_79_icon.json
2d78407b25edb7e54aa3171c6e4c13e4f65d4990 assets/superbwarfare/models/item/m_870.json
c5161c419b3b090c08e65010825e18c0fbb5d343 assets/superbwarfare/models/item/m_870_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_870_blueprint.json
c9c299481da1b79f3413b876d60f1bad7d891122 assets/superbwarfare/models/item/m_870_icon.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_98b_blueprint.json
26848edc4a8e0971321c5fccb47dd7d0e89a9f18 assets/superbwarfare/models/item/netherite_action.json
f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/netherite_barrel.json

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

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

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

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

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

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

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

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

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

@ -45,6 +45,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.M_60);
gunItem(ModItems.M_79);
gunItem(ModItems.M_1911);
gunItem(ModItems.M_870);
simpleItem(ModItems.EMPTY_PERK, "perk/");

22
src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java
View file

@ -47,30 +47,30 @@ public class M870Item extends GunItem implements GeoItem {
var data = GunData.from(stack);
if (data.bolt.actionTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.shift"));
}
if (data.reload.stage() == 1 && data.reload.prepareLoadTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.preparealt"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.preparealt"));
}
if (data.reload.stage() == 1 && data.reload.prepareTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.prepare"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.prepare"));
}
if (data.loadIndex.get() == 0 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.iterativeload"));
}
if (data.loadIndex.get() == 1 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload2"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.iterativeload2"));
}
if (data.reload.stage() == 3) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.finish"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.finish"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.idle"));
}
private PlayState idlePredicate(AnimationState<M870Item> event) {
@ -87,13 +87,13 @@ public class M870Item extends GunItem implements GeoItem {
&& ClientEventHandler.drawTime < 0.01
&& !data.reloading()) {
if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.run"));
}
}
event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.m870.idle"));
event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.m_870.idle"));
return PlayState.CONTINUE;
}
@ -119,7 +119,7 @@ public class M870Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/m870_icon.png");
return Mod.loc("textures/gun_icon/m_870_icon.png");
}
@Override

18
src/main/resources/assets/superbwarfare/animations/m870.animation.json → src/main/resources/assets/superbwarfare/animations/m_870.animation.json
View file

@ -1,11 +1,11 @@
{
"format_version": "1.8.0",
"animations": {
"animation.m870.idle": {
"animation.m_870.idle": {
"loop": true,
"animation_length": 0.25
},
"animation.m870.run": {
"animation.m_870.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -72,7 +72,7 @@
}
}
},
"animation.m870.run_fast": {
"animation.m_870.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
@ -193,7 +193,7 @@
}
}
},
"animation.m870.prepare": {
"animation.m_870.prepare": {
"animation_length": 0.75,
"bones": {
"main": {
@ -291,7 +291,7 @@
}
}
},
"animation.m870.preparealt": {
"animation.m_870.preparealt": {
"loop": "hold_on_last_frame",
"animation_length": 2,
"bones": {
@ -756,7 +756,7 @@
}
}
},
"animation.m870.iterativeload": {
"animation.m_870.iterativeload": {
"animation_length": 0.8,
"bones": {
"main": {
@ -972,7 +972,7 @@
}
}
},
"animation.m870.iterativeload2": {
"animation.m_870.iterativeload2": {
"animation_length": 0.8,
"bones": {
"main": {
@ -1188,7 +1188,7 @@
}
}
},
"animation.m870.shift": {
"animation.m_870.shift": {
"loop": "hold_on_last_frame",
"animation_length": 1,
"bones": {
@ -1419,7 +1419,7 @@
}
}
},
"animation.m870.finish": {
"animation.m_870.finish": {
"animation_length": 0.75,
"bones": {
"main": {

2
src/main/resources/assets/superbwarfare/geo/m870.geo.json → src/main/resources/assets/superbwarfare/geo/m_870.geo.json
View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.m870",
"identifier": "geometry.m_870",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 15,

0
src/main/resources/assets/superbwarfare/models/displaysettings/m870.item.json → src/main/resources/assets/superbwarfare/models/displaysettings/m_870.item.json
View file

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

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

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

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

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

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

2
src/main/resources/assets/superbwarfare/models/item/m8703d.json → src/main/resources/assets/superbwarfare/models/lod/m_870.json
View file

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

0
src/main/resources/assets/superbwarfare/textures/gun_icon/m870_icon.png → src/main/resources/assets/superbwarfare/textures/gun_icon/m_870_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

0
src/main/resources/assets/superbwarfare/textures/item/m8703d.png → src/main/resources/assets/superbwarfare/textures/item/lod/m_870.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
src/main/resources/assets/superbwarfare/textures/item/m870.png → src/main/resources/assets/superbwarfare/textures/item/m_870.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/main/resources/assets/superbwarfare/textures/item/m870_icon.png → src/main/resources/assets/superbwarfare/textures/item/m_870_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB