规范化莫辛纳甘

src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2

@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-22T00:10:55.0914017	Item Models: superbwarfare
+// 1.21.1	2025-05-22T00:12:54.9420818	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
@@ -127,7 +127,10 @@ db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar
 ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json
 9baf936f4340d41a0b5581857313240627b00386 assets/superbwarfare/models/item/mortar_deployer.json
 41381cc65305bbfc1324a08b580125073d198e11 assets/superbwarfare/models/item/mortar_shell.json
+52d77122fd9cf0e2efebbdb9325b92d76477ecc6 assets/superbwarfare/models/item/mosin_nagant.json
+469823515e0557a5de01f6c3c3cb4e291c010c0b assets/superbwarfare/models/item/mosin_nagant_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json
+264482666ae2b2be05f1ab7dbc0cf7b3360cf183 assets/superbwarfare/models/item/mosin_nagant_icon.json
 4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json
 9f523f08520ee193ca626e46602baddf46d2acc3 assets/superbwarfare/models/item/m_1911.json

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

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

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

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

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

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

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

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

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java

@@ -43,30 +43,30 @@ public class MosinNagantItem extends GunItem implements GeoItem {
         var data = GunData.from(stack);
 
         if (data.bolt.actionTimer.get() > 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.shift"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.shift"));
         }
 
-        if (data.reload.stage() == 1 && data.ammo.get() == 0) {
+        if (data.reload.stage() == 1 && GunData.from(stack).ammo.get() == 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.prepare_empty"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.prepare_empty"));
         }
 
-        if (data.reload.stage() == 1 && data.ammo.get() > 0) {
+        if (data.reload.stage() == 1 && GunData.from(stack).ammo.get() > 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.prepare"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.prepare"));
         }
 
         if (data.loadIndex.get() == 0 && data.reload.stage() == 2) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.iterativeload"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.iterativeload"));
         }
 
         if (data.loadIndex.get() == 1 && data.reload.stage() == 2) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.iterativeload2"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.iterativeload2"));
         }
 
         if (data.reload.stage() == 3) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin.finish"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mosin_nagant.finish"));
         }
 
-        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.idle"));
+        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin_nagant.idle"));
     }
 
     private PlayState idlePredicate(AnimationState<MosinNagantItem> event) {
@@ -85,14 +85,14 @@ public class MosinNagantItem extends GunItem implements GeoItem {
                 && ClientEventHandler.drawTime < 0.01
                 && !data.reloading()
         ) {
-            if (ClientEventHandler.tacticalSprint && data.bolt.actionTimer.get() == 0) {
+            if (ClientEventHandler.tacticalSprint && GunData.from(stack).bolt.actionTimer.get() == 0) {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.run_fast"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin_nagant.run_fast"));
             } else {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.run"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin_nagant.run"));
             }
         }
 
-        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.idle"));
+        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin_nagant.idle"));
     }
 
     @Override

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

@@ -1,10 +1,10 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.mosin.idle": {
+		"animation.mosin_nagant.idle": {
 			"animation_length": 1
 		},
-		"animation.mosin.draw": {
+		"animation.mosin_nagant.draw": {
 			"animation_length": 1,
 			"bones": {
 				"0": {
@@ -42,7 +42,7 @@
 				}
 			}
 		},
-		"animation.mosin.run": {
+		"animation.mosin_nagant.run": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -117,7 +117,7 @@
 				}
 			}
 		},
-		"animation.mosin.run_fast": {
+		"animation.mosin_nagant.run_fast": {
 			"loop": true,
 			"animation_length": 0.7,
 			"bones": {
@@ -207,7 +207,7 @@
 				}
 			}
 		},
-		"animation.mosin.fire": {
+		"animation.mosin_nagant.fire": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 0.202,
 			"bones": {
@@ -224,7 +224,7 @@
 				}
 			}
 		},
-		"animation.mosin.shift": {
+		"animation.mosin_nagant.shift": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 1.1,
 			"override_previous_animation": true,
@@ -566,7 +566,7 @@
 				}
 			}
 		},
-		"animation.mosin.prepare": {
+		"animation.mosin_nagant.prepare": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 2,
 			"override_previous_animation": true,
@@ -964,7 +964,7 @@
 				}
 			}
 		},
-		"animation.mosin.prepare_empty": {
+		"animation.mosin_nagant.prepare_empty": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 1,
 			"override_previous_animation": true,
@@ -1166,7 +1166,7 @@
 				}
 			}
 		},
-		"animation.mosin.iterativeload": {
+		"animation.mosin_nagant.iterativeload": {
 			"loop": true,
 			"animation_length": 0.75,
 			"override_previous_animation": true,
@@ -1402,7 +1402,7 @@
 				}
 			}
 		},
-		"animation.mosin.iterativeload2": {
+		"animation.mosin_nagant.iterativeload2": {
 			"loop": true,
 			"animation_length": 0.75,
 			"override_previous_animation": true,
@@ -1638,7 +1638,7 @@
 				}
 			}
 		},
-		"animation.mosin.finish": {
+		"animation.mosin_nagant.finish": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 1.25,
 			"override_previous_animation": true,

src/main/resources/assets/superbwarfare/models/displaysettings/mosin_nagant.item.json

@@ -0,0 +1,47 @@
+{
+  "credit": "Made with Blockbench",
+  "parent": "builtin/entity",
+  "texture_size": [
+    256,
+    256
+  ],
+  "gui_light": "front",
+  "display": {
+    "firstperson_righthand": {
+      "translation": [
+        -6.75,
+        3,
+        3
+      ],
+      "scale": [
+        1.05,
+        1.05,
+        1.25
+      ]
+    },
+    "firstperson_lefthand": {
+      "scale": [
+        0,
+        0,
+        0
+      ]
+    },
+    "gui": {
+      "rotation": [
+        165.69,
+        -39.63,
+        178.66
+      ],
+      "translation": [
+        -1.9,
+        -3.25,
+        0
+      ],
+      "scale": [
+        0.18,
+        0.18,
+        0.18
+      ]
+    }
+  }
+}

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

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

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

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