优化aa12的命名 优化模型位置分组

src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2

@@ -1,5 +1,8 @@
-// 1.21.1	2025-05-21T21:13:24.0760608	Item Models: superbwarfare
+// 1.21.1	2025-05-21T21:19:03.1904953	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
+eee5935baee9a6a78e6576735736512f528eb4db assets/superbwarfare/models/item/aa_12_icon.json
 0a9bfb695c2b5668863a2de4770f5bfca663c1dc assets/superbwarfare/models/item/agm.json
 29ad5daadcdf7c10771fc45b649c527d16325cbb assets/superbwarfare/models/item/aircraft_catapult.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json

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

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

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

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

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

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

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

@@ -19,17 +19,17 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
 
     @Override
     public ResourceLocation getAnimationResource(Aa12Item animatable) {
-        return Mod.loc("animations/aa12.animation.json");
+        return Mod.loc("animations/aa_12.animation.json");
     }
 
     @Override
     public ResourceLocation getModelResource(Aa12Item animatable) {
-        return Mod.loc("geo/aa12.geo.json");
+        return Mod.loc("geo/aa_12.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(Aa12Item animatable) {
-        return Mod.loc("textures/item/aa12_new.png");
+        return Mod.loc("textures/item/aa_12.png");
     }
 
     @Override

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

@@ -26,7 +26,8 @@ public class ModItemModelProvider extends ItemModelProvider {
 
     @Override
     protected void registerModels() {
-        // test
+        // gun
+        gunItem(ModItems.AA_12);
         gunItem(ModItems.AURELIA_SCEPTRE);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");

src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java

@@ -54,22 +54,22 @@ public class Aa12Item extends GunItem implements GeoItem {
 
         if (this.animationProcedure.equals("empty")) {
             if (GunData.from(stack).reload.empty()) {
-                return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_empty"));
+                return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa_12.reload_empty"));
             }
 
             if (GunData.from(stack).reload.normal()) {
-                return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_normal"));
+                return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa_12.reload_normal"));
             }
 
             if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
                 if (ClientEventHandler.tacticalSprint) {
-                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run_fast"));
+                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.run_fast"));
                 } else {
-                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run"));
+                    return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.run"));
                 }
             }
 
-            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.idle"));
+            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa_12.idle"));
         }
         return PlayState.STOP;
     }

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

@@ -1,7 +1,7 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.aa12.idle": {
+		"animation.aa_12.idle": {
 			"loop": true,
 			"animation_length": 0.25,
 			"bones": {
@@ -12,7 +12,7 @@
 				}
 			}
 		},
-		"animation.aa12.run": {
+		"animation.aa_12.run": {
 			"loop": true,
 			"animation_length": 0.7917,
 			"bones": {
@@ -80,7 +80,7 @@
 				}
 			}
 		},
-		"animation.aa12.run_fast": {
+		"animation.aa_12.run_fast": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -157,10 +157,10 @@
 				}
 			}
 		},
-		"animation.aa12.fire": {
+		"animation.aa_12.fire": {
 			"animation_length": 0.125
 		},
-		"animation.aa12.reload_empty": {
+		"animation.aa_12.reload_empty": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 4.1167,
 			"bones": {
@@ -593,7 +593,7 @@
 				}
 			}
 		},
-		"animation.aa12.reload_normal": {
+		"animation.aa_12.reload_normal": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 2.9667,
 			"bones": {

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

@@ -3,7 +3,7 @@
 	"minecraft:geometry": [
 		{
 			"description": {
-				"identifier": "geometry.aa12",
+				"identifier": "geometry.aa_12",
 				"texture_width": 256,
 				"texture_height": 256,
 				"visible_bounds_width": 9,

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

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

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

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

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

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

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

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

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

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

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

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