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

规范化glock 17

Browse source
This commit is contained in:
17146 2025-05-21 19:07:42 +08:00 • committed by Light_Quanta
parent 7b9d9f560a
commit b1380e867a
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
28 changed files with 103 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// 1.21.1 2025-05-21T21:25:03.9313812 Item Models: superbwarfare
// 1.21.1 2025-05-21T21:28:40.4565326 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
@ -40,7 +40,10 @@ fc892b610a110980dbc6f8e2c080672b5dc06e99 assets/superbwarfare/models/item/copper
7e43d8e9c4b8589f7665c46d4b67de645949cc6b assets/superbwarfare/models/item/creative_charging_station.json
b0296c3d68f3b5ae4945b46384fa20a1ff32cac5 assets/superbwarfare/models/item/crowbar.json
d81b738e17048945459ff8b59f8f83e872171473 assets/superbwarfare/models/item/defuser.json
b863c75950f3d5f18b49d829ab05996ceeae24e1 assets/superbwarfare/models/item/devotion.json
db98560069ace15f83e790a374e0e58eee5ae3c7 assets/superbwarfare/models/item/devotion_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json
10273ef8d8767554add02a877f4e2b230ad25a79 assets/superbwarfare/models/item/devotion_icon.json
6f4a829dc159f1740f52265d01730ecb6a840d81 assets/superbwarfare/models/item/dog_tag.json
9112aa14b3f057c3b29c932cfaa60a11b37757dc assets/superbwarfare/models/item/dps_generator_deployer.json
dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone.json
@ -50,7 +53,10 @@ b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing
c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json
5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json
4bf506de247afbbec816f6637030f637e68ce0d4 assets/superbwarfare/models/item/ge_helmet_m_35.json
59322dfc0e0a28d793ed3603ed2084a5ac045206 assets/superbwarfare/models/item/glock_17.json
d842316fc4b25c17889fca4f89539d9e0829cda1 assets/superbwarfare/models/item/glock_17_base.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_17_blueprint.json
eb7c2404c141dde965b8cb13c1e368eab6a8fa16 assets/superbwarfare/models/item/glock_17_icon.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_18_blueprint.json
8752c2b2b648ff23d6b93eedcc6c0500c695afd7 assets/superbwarfare/models/item/grain.json
c256914755344645319528b6abfabb6179f75052 assets/superbwarfare/models/item/handgun_ammo.json

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

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

0
src/main/resources/assets/superbwarfare/models/item/devotion_base.json → src/generated/resources/assets/superbwarfare/models/item/devotion_base.json
View file

2
src/main/resources/assets/superbwarfare/models/item/devotion_icon.json → src/generated/resources/assets/superbwarfare/models/item/devotion_icon.json
View file

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

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

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

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

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

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

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

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

@ -23,17 +23,17 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
@Override
public ResourceLocation getAnimationResource(Glock17Item animatable) {
return Mod.loc("animations/glock17.animation.json");
return Mod.loc("animations/glock_17.animation.json");
}
@Override
public ResourceLocation getModelResource(Glock17Item animatable) {
return Mod.loc("geo/glock17.geo.json");
return Mod.loc("geo/glock_17.geo.json");
}
@Override
public ResourceLocation getTextureResource(Glock17Item animatable) {
return Mod.loc("textures/item/glock17.png");
return Mod.loc("textures/item/glock_17.png");
}
@Override

4
src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java
View file

@ -24,7 +24,7 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
@Override
public ResourceLocation getAnimationResource(Glock18Item animatable) {
return Mod.loc("animations/glock17.animation.json");
return Mod.loc("animations/glock_17.animation.json");
}
@Override
@ -34,7 +34,7 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
@Override
public ResourceLocation getTextureResource(Glock18Item animatable) {
return Mod.loc("textures/item/glock17.png");
return Mod.loc("textures/item/glock_17.png");
}
@Override

2
src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java
View file

@ -23,7 +23,7 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
@Override
public ResourceLocation getAnimationResource(M1911Item animatable) {
return Mod.loc("animations/glock17.animation.json");
return Mod.loc("animations/glock_17.animation.json");
}
@Override

2
src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java
View file

@ -23,7 +23,7 @@ public class Mp443ItemModel extends GeoModel<Mp443Item> {
@Override
public ResourceLocation getAnimationResource(Mp443Item animatable) {
return Mod.loc("animations/glock17.animation.json");
return Mod.loc("animations/glock_17.animation.json");
}
@Override

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

@ -32,6 +32,8 @@ public class ModItemModelProvider extends ItemModelProvider {
gunItem(ModItems.AK_47);
gunItem(ModItems.AURELIA_SCEPTRE);
gunItem(ModItems.BOCEK);
gunItem(ModItems.DEVOTION);
gunItem(ModItems.GLOCK_17);
simpleItem(ModItems.EMPTY_PERK, "perk/");

14
src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java
View file

@ -44,15 +44,15 @@ public class Glock17Item extends GunItem implements GeoItem {
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (GunData.from(stack).reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_empty"));
}
if (GunData.from(stack).reload.normal()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal"));
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_normal"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle"));
}
private PlayState idlePredicate(AnimationState<Glock17Item> event) {
@ -65,13 +65,13 @@ public class Glock17Item extends GunItem implements GeoItem {
&& ClientEventHandler.cantSprint == 0
&& !(GunData.from(stack).reload.normal() || GunData.from(stack).reload.empty()) && ClientEventHandler.drawTime < 0.01) {
if (ClientEventHandler.tacticalSprint) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run_fast"));
} else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run"));
}
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle"));
}
@Override
@ -94,7 +94,7 @@ public class Glock17Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/glock_icon.png");
return Mod.loc("textures/gun_icon/glock_17_icon.png");
}
@Override

2
src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java
View file

@ -96,7 +96,7 @@ public class Glock18Item extends GunItem implements GeoItem {
@Override
public ResourceLocation getGunIcon() {
return Mod.loc("textures/gun_icon/glock_icon.png");
return Mod.loc("textures/gun_icon/glock_17_icon.png");
}
@Override

10
src/main/resources/assets/superbwarfare/animations/glock17.animation.json → src/main/resources/assets/superbwarfare/animations/glock_17.animation.json
View file

@ -1,11 +1,11 @@
{
"format_version": "1.8.0",
"animations": {
"animation.glock.idle": {
"animation.glock_17.idle": {
"loop": true,
"animation_length": 2
},
"animation.glock.run": {
"animation.glock_17.run": {
"loop": true,
"animation_length": 0.6,
"bones": {
@ -173,7 +173,7 @@
}
}
},
"animation.glock.run_fast": {
"animation.glock_17.run_fast": {
"loop": true,
"animation_length": 0.6,
"bones": {
@ -345,7 +345,7 @@
}
}
},
"animation.glock.reload_normal": {
"animation.glock_17.reload_normal": {
"loop": "hold_on_last_frame",
"animation_length": 2.25,
"bones": {
@ -709,7 +709,7 @@
}
}
},
"animation.glock.reload_empty": {
"animation.glock_17.reload_empty": {
"loop": "hold_on_last_frame",
"animation_length": 2.65,
"bones": {

2
src/main/resources/assets/superbwarfare/geo/glock17.geo.json → src/main/resources/assets/superbwarfare/geo/glock_17.geo.json
View file

@ -3,7 +3,7 @@
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.glock17",
"identifier": "geometry.glock_17",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 126,

0
src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json → src/main/resources/assets/superbwarfare/models/displaysettings/glock_17.item.json
View file

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

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

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

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

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

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

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

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

4
src/main/resources/assets/superbwarfare/models/item/devotion3d.json → src/main/resources/assets/superbwarfare/models/lod/devotion.json
View file

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

4
src/main/resources/assets/superbwarfare/models/item/glock17_3d.json → src/main/resources/assets/superbwarfare/models/lod/glock_17.json
View file

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

0
src/main/resources/assets/superbwarfare/textures/gun_icon/glock_icon.png → src/main/resources/assets/superbwarfare/textures/gun_icon/glock_17_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
src/main/resources/assets/superbwarfare/textures/item/glock17.png → src/main/resources/assets/superbwarfare/textures/item/glock_17.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
src/main/resources/assets/superbwarfare/textures/item/glock17_icon.png → src/main/resources/assets/superbwarfare/textures/item/glock_17_icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8 KiB

After

Width:  |  Height:  |  Size: 8 KiB

0
src/main/resources/assets/superbwarfare/textures/item/devotion3d.png → src/main/resources/assets/superbwarfare/textures/item/lod/devotion.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
src/main/resources/assets/superbwarfare/textures/item/glock17_3d.png → src/main/resources/assets/superbwarfare/textures/item/lod/glock_17.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 337 B