规范化m79

src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2

@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-21T21:50:33.4509796	Item Models: superbwarfare
+// 1.21.1	2025-05-21T23:19:47.6644332	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
@@ -130,7 +130,10 @@ b023e4919fe4d05dc024d29fd9eb8f4e1bd588fb assets/superbwarfare/models/item/m_60.j
 2a1130d781ff276a8dc7ba13a992583f1e484f80 assets/superbwarfare/models/item/m_60_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_60_blueprint.json
 e141044945c8a873fc0df3dcf9e7a486726c0807 assets/superbwarfare/models/item/m_60_icon.json
+9673c6d8cc3a58bfe7b686b0328774047e400561 assets/superbwarfare/models/item/m_79.json
+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
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_870_blueprint.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_98b_blueprint.json
 26848edc4a8e0971321c5fccb47dd7d0e89a9f18 assets/superbwarfare/models/item/netherite_action.json

src/generated/resources/assets/superbwarfare/models/item/m_79.json

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

src/generated/resources/assets/superbwarfare/models/item/m_79_base.json

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

src/generated/resources/assets/superbwarfare/models/item/m_79_icon.json

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

src/main/java/com/atsuishio/superbwarfare/client/model/item/M79ItemModel.java

@@ -19,7 +19,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
 
     @Override
     public ResourceLocation getAnimationResource(M79Item animatable) {
-        return Mod.loc("animations/m79.animation.json");
+        return Mod.loc("animations/m_79.animation.json");
     }
 
     @Override
@@ -29,7 +29,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
 
     @Override
     public ResourceLocation getTextureResource(M79Item animatable) {
-        return Mod.loc("textures/item/m79.png");
+        return Mod.loc("textures/item/m_79.png");
     }
 
     @Override

src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java

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

src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java

@@ -53,20 +53,21 @@ public class M79Item extends GunItem implements GeoItem {
         if (player == null) return PlayState.STOP;
         ItemStack stack = player.getMainHandItem();
         if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
+        var data = GunData.from(stack);
 
-        if (GunData.from(stack).reload.empty()) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload"));
+        if (data.reload.empty()) {
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_79.reload"));
         }
 
         if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
             if (ClientEventHandler.tacticalSprint) {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run_fast"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_79.run_fast"));
             } else {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_79.run"));
             }
         }
 
-        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.idle"));
+        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_79.idle"));
     }
 
     @Override
@@ -82,7 +83,7 @@ public class M79Item extends GunItem implements GeoItem {
 
     @Override
     public ResourceLocation getGunIcon() {
-        return Mod.loc("textures/gun_icon/m79_icon.png");
+        return Mod.loc("textures/gun_icon/m_79_icon.png");
     }
 
     @Override

src/main/resources/assets/superbwarfare/animations/m_79.animation.json

@@ -1,11 +1,11 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.m79.idle": {
+		"animation.m_79.idle": {
 			"loop": true,
 			"animation_length": 2
 		},
-		"animation.m79.draw": {
+		"animation.m_79.draw": {
 			"animation_length": 1,
 			"bones": {
 				"0": {
@@ -61,7 +61,7 @@
 				}
 			}
 		},
-		"animation.m79.run": {
+		"animation.m_79.run": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -136,7 +136,7 @@
 				}
 			}
 		},
-		"animation.m79.run_fast": {
+		"animation.m_79.run_fast": {
 			"loop": true,
 			"animation_length": 0.7,
 			"bones": {
@@ -218,7 +218,7 @@
 				}
 			}
 		},
-		"animation.m79.fire": {
+		"animation.m_79.fire": {
 			"animation_length": 0.1,
 			"bones": {
 				"0": {
@@ -231,7 +231,7 @@
 				}
 			}
 		},
-		"animation.m79.reload": {
+		"animation.m_79.reload": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3.25,
 			"bones": {

src/main/resources/assets/superbwarfare/models/item/m79_base.json

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

src/main/resources/assets/superbwarfare/models/item/m79icon.json

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

src/main/resources/assets/superbwarfare/models/item/m_79.json

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

src/main/resources/assets/superbwarfare/models/lod/m_79.json

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