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

规范化kar 98k

Browse source
This commit is contained in:
17146 2025-05-21 21:04:06 +08:00 • committed by Light_Quanta
parent 0dbdc715c0
commit 5530cf77e1
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
18 changed files with 75 additions and 70 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-21T21:39:58.7875729 Item Models: superbwarfare
// 1.21.1 2025-05-21T21:43:37.7471932 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
@ -93,7 +93,10 @@ e04fdc11913515f88a8a5f5dad4c12a7daafaf9a assets/superbwarfare/models/item/javeli
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json
00908dfc5fd1cdf7f52fe550cb33d71ec46cc112 assets/superbwarfare/models/item/javelin_icon.json
195c1b7cbcce9b0ac42ecbfc21a8cafff8c78372 assets/superbwarfare/models/item/jump_pad.json
929fbb16bdbb6d44b0d77b6dd17b41ebb6d7047e assets/superbwarfare/models/item/k_98.json
89b09e3941be6ac188a2882f76cbed1900ed9c88 assets/superbwarfare/models/item/k_98_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json
cca79a16a674a247d5a786253407ada56c95fc78 assets/superbwarfare/models/item/k_98_icon.json
02214d593955d899847663e54f3dbcd396da0760 assets/superbwarfare/models/item/large_battery_pack.json
4c9b6c2911ae5e6e2a026d2ae9d3c0564cdba0b3 assets/superbwarfare/models/item/large_motor.json
95c0f92c4a4b3adff9c95878540071b04a921792 assets/superbwarfare/models/item/large_propeller.json

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

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

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

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

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

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

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

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

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

@ -40,6 +40,7 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.HUNTING_RIFLE);
gunItem(ModItems.INSIDIOUS);
gunItem(ModItems.JAVELIN);
gunItem(ModItems.K_98);
simpleItem(ModItems.EMPTY_PERK, "perk/");

22
src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java
View file

@ -44,30 +44,30 @@ public class K98Item extends GunItem implements GeoItem {
var data = GunData.from(stack);
if (data.bolt.actionTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.shift"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.shift"));
}
if (data.reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.reload_empty"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.reload_empty"));
}
if (data.reload.stage() == 1 && data.reload.prepareTimer.get() > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.prepare"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.prepare"));
}
if (data.loadIndex.get() == 0 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.iterativeload"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.iterativeload"));
}
if (data.loadIndex.get() == 1 && data.reload.stage() == 2) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.iterativeload2"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.iterativeload2"));
}
if (data.reload.stage() == 3) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.finish"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.finish"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.idle"));
}
private PlayState idlePredicate(AnimationState<K98Item> event) {
@ -88,13 +88,13 @@ public class K98Item extends GunItem implements GeoItem {
&& !data.reloading()
) {
if (ClientEventHandler.tacticalSprint && data.bolt.actionTimer.get() == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.idle"));
}
@Override
@ -123,7 +123,7 @@ public class K98Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/k98_icon.png");
return Mod.loc("textures/gun_icon/k_98_icon.png");
}
@Override

26
src/main/resources/assets/superbwarfare/animations/k98.animation.json → src/main/resources/assets/superbwarfare/animations/k_98.animation.json
View file

@ -1,10 +1,10 @@
{
"format_version": "1.8.0",
"animations": {
"animation.k98.idle": {
"animation.k_98.idle": {
"animation_length": 1
},
"animation.k98.draw": {
"animation.k_98.draw": {
"animation_length": 1,
"bones": {
"0": {
@ -42,7 +42,7 @@
}
}
},
"animation.k98.run": {
"animation.k_98.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
@ -117,7 +117,7 @@
}
}
},
"animation.k98.run_fast": {
"animation.k_98.run_fast": {
"loop": true,
"animation_length": 0.7,
"bones": {
@ -207,7 +207,7 @@
}
}
},
"animation.k98.fire": {
"animation.k_98.fire": {
"loop": "hold_on_last_frame",
"animation_length": 0.202,
"bones": {
@ -224,7 +224,7 @@
}
}
},
"animation.k98.shift": {
"animation.k_98.shift": {
"loop": "hold_on_last_frame",
"animation_length": 1.1,
"override_previous_animation": true,
@ -566,7 +566,7 @@
}
}
},
"animation.k98.reload_empty": {
"animation.k_98.reload_empty": {
"loop": "hold_on_last_frame",
"animation_length": 3,
"override_previous_animation": true,
@ -1216,7 +1216,7 @@
}
}
},
"animation.k98.prepare": {
"animation.k_98.prepare": {
"loop": "hold_on_last_frame",
"animation_length": 2,
"override_previous_animation": true,
@ -1600,7 +1600,7 @@
}
}
},
"animation.k98.iterativeload": {
"animation.k_98.iterativeload": {
"loop": true,
"animation_length": 0.75,
"override_previous_animation": true,
@ -1832,11 +1832,11 @@
},
"sound_effects": {
"0.0": {
"effect": "k98_loop"
"effect": "k_98_loop"
}
}
},
"animation.k98.iterativeload2": {
"animation.k_98.iterativeload2": {
"loop": true,
"animation_length": 0.75,
"override_previous_animation": true,
@ -2068,11 +2068,11 @@
},
"sound_effects": {
"0.0": {
"effect": "k98_loop"
"effect": "k_98_loop"
}
}
},
"animation.k98.finish": {
"animation.k_98.finish": {
"loop": "hold_on_last_frame",
"animation_length": 1.25,
"override_previous_animation": true,

2
src/main/resources/assets/superbwarfare/geo/kar98k.geo.json → src/main/resources/assets/superbwarfare/geo/k_98.geo.json
View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.unknown",
"identifier": "geometry.k_98",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 4,

0
src/main/resources/assets/superbwarfare/models/displaysettings/k98.item.json → src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json
View file

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

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

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

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

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

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

4
src/main/resources/assets/superbwarfare/models/item/k98_3d.json → src/main/resources/assets/superbwarfare/models/lod/k_98.json
View file

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

0
src/main/resources/assets/superbwarfare/textures/gun_icon/k98_icon.png → src/main/resources/assets/superbwarfare/textures/gun_icon/k_98_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
src/main/resources/assets/superbwarfare/textures/item/k98.png → src/main/resources/assets/superbwarfare/textures/item/k_98.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
src/main/resources/assets/superbwarfare/textures/item/k98_icon.png → src/main/resources/assets/superbwarfare/textures/item/k_98_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/main/resources/assets/superbwarfare/textures/item/lod/k_98.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 418 B