规范化mk14

src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2

@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-21T23:44:10.9537315	Item Models: superbwarfare
+// 1.21.1	2025-05-22T00:10:55.0914017	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
@@ -116,7 +116,10 @@ e5860d8bdbca7cc381ab301214b43fd2524acd90 assets/superbwarfare/models/item/minigu
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json
 45f7b6d457687457b2aa1261a2cfcc4cc2279f6d assets/superbwarfare/models/item/minigun_icon.json
 c206cd345f459733399e0be4692586849ef0aac2 assets/superbwarfare/models/item/missile_engine.json
+4b9f099940de8661346d9b89f45e586f69d8be70 assets/superbwarfare/models/item/mk_14.json
+315289bc9313b7032c98258e536ab843a7926771 assets/superbwarfare/models/item/mk_14_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_14_blueprint.json
+acbf356ab7093e75d90d9fe970a7776c70c62892 assets/superbwarfare/models/item/mk_14_icon.json
 a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/mk_42_blueprint.json
 a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/mle_1934_blueprint.json
 db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar_barrel.json

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

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

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

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

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

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

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

@@ -27,17 +27,17 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
 
     @Override
     public ResourceLocation getAnimationResource(Mk14Item animatable) {
-        return Mod.loc("animations/mk14ebr.animation.json");
+        return Mod.loc("animations/mk_14.animation.json");
     }
 
     @Override
     public ResourceLocation getModelResource(Mk14Item animatable) {
-        return Mod.loc("geo/mk14ebr.geo.json");
+        return Mod.loc("geo/mk_14.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(Mk14Item animatable) {
-        return Mod.loc("textures/item/mk14.png");
+        return Mod.loc("textures/item/mk_14.png");
     }
 
     @Override

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

@@ -49,6 +49,7 @@ public class ModItemModelProvider extends ItemModelProvider {
         gunItem(ModItems.M_98B);
         gunItem(ModItems.MARLIN);
         gunItem(ModItems.MINIGUN);
+        gunItem(ModItems.MK_14);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");
 

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java

@@ -54,15 +54,15 @@ public class Mk14Item extends GunItem implements GeoItem {
         if (data.reload.empty()) {
             if (drum) {
                 if (grip) {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_empty_drum_grip"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_empty_drum_grip"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_empty_drum"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_empty_drum"));
                 }
             } else {
                 if (grip) {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_empty_grip"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_empty_grip"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_empty"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_empty"));
                 }
             }
         }
@@ -70,35 +70,35 @@ public class Mk14Item extends GunItem implements GeoItem {
         if (data.reload.normal()) {
             if (drum) {
                 if (grip) {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal_drum_grip"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_normal_drum_grip"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal_drum"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_normal_drum"));
                 }
             } else {
                 if (grip) {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal_grip"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_normal_grip"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.reload_normal"));
                 }
             }
         }
 
         if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
             if (ClientEventHandler.tacticalSprint) {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run_fast"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mk_14.run_fast"));
             } else {
                 if (grip) {
-                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.run_grip"));
+                    return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.run_grip"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run"));
+                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mk_14.run"));
                 }
             }
         }
 
         if (grip) {
-            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.idle_grip"));
+            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mk_14.idle_grip"));
         } else {
-            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.idle"));
+            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mk_14.idle"));
         }
     }
 
@@ -109,10 +109,10 @@ public class Mk14Item extends GunItem implements GeoItem {
         if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
 
         if (ClickHandler.isEditing) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.edit"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mk_14.edit"));
         }
 
-        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.idle"));
+        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mk_14.idle"));
     }
 
     @Override
@@ -160,7 +160,7 @@ public class Mk14Item extends GunItem implements GeoItem {
 
     @Override
     public ResourceLocation getGunIcon() {
-        return Mod.loc("textures/gun_icon/mk14ebr_icon.png");
+        return Mod.loc("textures/gun_icon/mk_14_icon.png");
     }
 
     @Override

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

@@ -1,7 +1,7 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.m14.idle": {
+      "animation.mk_14.idle": {
 			"animation_length": 4,
 			"bones": {
 				"main": {
@@ -10,7 +10,7 @@
 				}
 			}
 		},
-		"animation.m14.edit": {
+      "animation.mk_14.edit": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 0.4083,
 			"bones": {
@@ -44,7 +44,7 @@
 				}
 			}
 		},
-		"animation.m14.run": {
+      "animation.mk_14.run": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -105,7 +105,7 @@
 				}
 			}
 		},
-		"animation.m14.run_fast": {
+      "animation.mk_14.run_fast": {
 			"loop": true,
 			"animation_length": 0.725,
 			"bones": {
@@ -170,7 +170,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_normal": {
+      "animation.mk_14.reload_normal": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
 			"bones": {
@@ -477,7 +477,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_empty": {
+      "animation.mk_14.reload_empty": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 4,
 			"bones": {
@@ -861,7 +861,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_normal_drum": {
+      "animation.mk_14.reload_normal_drum": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
 			"bones": {
@@ -1169,7 +1169,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_empty_drum": {
+      "animation.mk_14.reload_empty_drum": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 4,
 			"bones": {
@@ -1554,7 +1554,7 @@
 				}
 			}
 		},
-		"animation.m14.idle_grip": {
+      "animation.mk_14.idle_grip": {
 			"animation_length": 4,
 			"bones": {
 				"main": {
@@ -1567,7 +1567,7 @@
 				}
 			}
 		},
-		"animation.m14.run_grip": {
+      "animation.mk_14.run_grip": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -1632,7 +1632,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_normal_grip": {
+      "animation.mk_14.reload_normal_grip": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
 			"bones": {
@@ -1939,7 +1939,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_empty_grip": {
+      "animation.mk_14.reload_empty_grip": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 4,
 			"bones": {
@@ -2323,7 +2323,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_normal_drum_grip": {
+      "animation.mk_14.reload_normal_drum_grip": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
 			"bones": {
@@ -2631,7 +2631,7 @@
 				}
 			}
 		},
-		"animation.m14.reload_empty_drum_grip": {
+      "animation.mk_14.reload_empty_drum_grip": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 4,
 			"bones": {

src/main/resources/assets/superbwarfare/geo/mk_14.geo.json

@@ -3,7 +3,7 @@
 	"minecraft:geometry": [
 		{
 			"description": {
-				"identifier": "geometry.unknown",
+              "identifier": "geometry.mk_14",
 				"texture_width": 256,
 				"texture_height": 256,
 				"visible_bounds_width": 77,

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

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

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

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

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

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