调整部分物品命名#2

src/generated/resources/data/superbwarfare/tags/items/gun.json

@@ -5,7 +5,7 @@
     "superbwarfare:glock_18",
     "superbwarfare:mp_443",
     "superbwarfare:m_1911",
-    "superbwarfare:abekiri",
+    "superbwarfare:homemade_shotgun",
     "superbwarfare:trachelium",
     "superbwarfare:vector",
     "superbwarfare:ak_47",

src/generated/resources/data/superbwarfare/tags/items/normal_gun.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "superbwarfare:abekiri",
+    "superbwarfare:homemade_shotgun",
     "superbwarfare:ak_47",
     "superbwarfare:ak_12",
     "superbwarfare:svd",

src/generated/resources/data/superbwarfare/tags/items/shotgun.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "superbwarfare:abekiri",
+    "superbwarfare:homemade_shotgun",
     "superbwarfare:m_870",
     "superbwarfare:aa_12"
   ]

src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "superbwarfare:abekiri",
+    "superbwarfare:homemade_shotgun",
     "superbwarfare:m_870",
     "superbwarfare:aa_12"
   ]

src/main/java/com/atsuishio/superbwarfare/client/layer/HomemadeShotgunLayer.java

@@ -12,10 +12,11 @@ import software.bernie.geckolib.cache.object.BakedGeoModel;
 import software.bernie.geckolib.renderer.GeoRenderer;
 import software.bernie.geckolib.renderer.layer.GeoRenderLayer;
 
-public class AbekiriLayer extends GeoRenderLayer<HomemadeShotgunItem> {
-    private static final ResourceLocation LAYER = ModUtils.loc("textures/item/abekiri_e.png");
+public class HomemadeShotgunLayer extends GeoRenderLayer<HomemadeShotgunItem> {
 
-    public AbekiriLayer(GeoRenderer<HomemadeShotgunItem> entityRenderer) {
+    private static final ResourceLocation LAYER = ModUtils.loc("textures/item/homemade_shotgun_e.png");
+
+    public HomemadeShotgunLayer(GeoRenderer<HomemadeShotgunItem> entityRenderer) {
         super(entityRenderer);
     }
 

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

@@ -15,21 +15,21 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
 import software.bernie.geckolib.core.animation.AnimationState;
 import software.bernie.geckolib.model.GeoModel;
 
-public class AbekiriItemModel extends GeoModel<HomemadeShotgunItem> {
+public class HomemadeShotgunItemModel extends GeoModel<HomemadeShotgunItem> {
 
     @Override
     public ResourceLocation getAnimationResource(HomemadeShotgunItem animatable) {
-        return ModUtils.loc("animations/abekiri.animation.json");
+        return ModUtils.loc("animations/homemade_shotgun.animation.json");
     }
 
     @Override
     public ResourceLocation getModelResource(HomemadeShotgunItem animatable) {
-        return ModUtils.loc("geo/abekiri.geo.json");
+        return ModUtils.loc("geo/homemade_shotgun.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(HomemadeShotgunItem animatable) {
-        return ModUtils.loc("textures/item/abekiri.png");
+        return ModUtils.loc("textures/item/homemade_shotgun.png");
     }
 
     @Override
@@ -37,7 +37,6 @@ public class AbekiriItemModel extends GeoModel<HomemadeShotgunItem> {
         CoreGeoBone gun = getAnimationProcessor().getBone("bone");
         CoreGeoBone shen = getAnimationProcessor().getBone("shen");
 
-
         Player player = Minecraft.getInstance().player;
         if (player == null) return;
         ItemStack stack = player.getMainHandItem();

src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java

@@ -1,8 +1,8 @@
 package com.atsuishio.superbwarfare.client.renderer.item;
 
 import com.atsuishio.superbwarfare.client.AnimationHelper;
-import com.atsuishio.superbwarfare.client.layer.AbekiriLayer;
-import com.atsuishio.superbwarfare.client.model.item.AbekiriItemModel;
+import com.atsuishio.superbwarfare.client.layer.HomemadeShotgunLayer;
+import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel;
 import com.atsuishio.superbwarfare.event.ClientEventHandler;
 import com.atsuishio.superbwarfare.init.ModTags;
 import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem;
@@ -27,11 +27,11 @@ import software.bernie.geckolib.util.RenderUtils;
 import java.util.HashSet;
 import java.util.Set;
 
-public class AbekiriItemRenderer extends GeoItemRenderer<HomemadeShotgunItem> {
+public class HomemadeShotgunItemRenderer extends GeoItemRenderer<HomemadeShotgunItem> {
 
-    public AbekiriItemRenderer() {
-        super(new AbekiriItemModel());
-        this.addRenderLayer(new AbekiriLayer(this));
+    public HomemadeShotgunItemRenderer() {
+        super(new HomemadeShotgunItemModel());
+        this.addRenderLayer(new HomemadeShotgunLayer(this));
     }
 
     @Override

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

@@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.item.gun.shotgun;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.client.PoseTool;
-import com.atsuishio.superbwarfare.client.renderer.item.AbekiriItemRenderer;
+import com.atsuishio.superbwarfare.client.renderer.item.HomemadeShotgunItemRenderer;
 import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent;
 import com.atsuishio.superbwarfare.event.ClientEventHandler;
 import com.atsuishio.superbwarfare.init.ModItems;
@@ -59,7 +59,7 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
     public void initializeClient(Consumer<IClientItemExtensions> consumer) {
         super.initializeClient(consumer);
         consumer.accept(new IClientItemExtensions() {
-            private final BlockEntityWithoutLevelRenderer renderer = new AbekiriItemRenderer();
+            private final BlockEntityWithoutLevelRenderer renderer = new HomemadeShotgunItemRenderer();
 
             @Override
             public BlockEntityWithoutLevelRenderer getCustomRenderer() {

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

@@ -166,7 +166,7 @@
 					]
 				},
 				{
-					"name": "abekiri",
+					"name": "homemade_shotgun",
 					"parent": "gun",
 					"pivot": [0.85134, 4.15064, 1.93283],
 					"cubes": [
@@ -552,7 +552,7 @@
 				},
 				{
 					"name": "guan",
-					"parent": "abekiri",
+					"parent": "homemade_shotgun",
 					"pivot": [0.85134, 4.15064, 1.93283],
 					"cubes": [
 						{
@@ -996,7 +996,7 @@
 				},
 				{
 					"name": "jiaodai",
-					"parent": "abekiri",
+					"parent": "homemade_shotgun",
 					"pivot": [0.04048, 3.75996, 2.58283]
 				},
 				{

src/main/resources/assets/superbwarfare/lang/en_us.json

@@ -26,7 +26,7 @@
   "item.superbwarfare.m_4": "M4A1",
   "item.superbwarfare.aa_12": "AA-12",
   "item.superbwarfare.sks": "SKS",
-  "item.superbwarfare.abekiri": "Legendary Gun: Abe Slayer",
+  "item.superbwarfare.homemade_shotgun": "Homemade Shotgun",
   "item.superbwarfare.trachelium": "\"Trachelium-Caeruleum\"",
   "des.superbwarfare.trachelium_1": "Calm Spirit and Gentle Love",
   "des.superbwarfare.trachelium_2": "\"May the flowers in my hand convey my feelings to you\"",

src/main/resources/assets/superbwarfare/lang/zh_cn.json

@@ -26,7 +26,7 @@
   "item.superbwarfare.m_4": "M4A1卡宾枪",
   "item.superbwarfare.aa_12": "AA-12霰弹枪",
   "item.superbwarfare.sks": "SKS射手步枪",
-  "item.superbwarfare.abekiri": "名銃.安倍切り",
+  "item.superbwarfare.homemade_shotgun": "名铳·安倍切",
   "item.superbwarfare.trachelium": "“夕雾花”",
   "des.superbwarfare.trachelium_1": "热烈想念，一往情深",
   "des.superbwarfare.trachelium_2": "“愿手中的这束花，能够传达我的深情”",

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

@@ -1,27 +0,0 @@
-{
-	"loader": "forge:separate_transforms",
-	"gui_light": "front",
-	"base": {
-		"parent": "superbwarfare:item/abekiri_base"
-	},
-	"perspectives": {
-		"gui": {
-			"parent": "superbwarfare:item/abekiri3d"
-		},
-		"thirdperson_righthand": {
-			"parent": "superbwarfare:item/abekiri3d"
-		},
-		"thirdperson_lefthand": {
-			"parent": "superbwarfare:item/abekiri3d"
-		},
-		"ground": {
-			"parent": "superbwarfare:item/abekiri3d"
-		},
-		"fixed": {
-			"parent": "superbwarfare:item/abekiri3d"
-		},
-		"head": {
-			"parent": "superbwarfare:item/abekiri3d"
-		}
-	}
-}

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

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

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

@@ -0,0 +1,27 @@
+{
+	"loader": "forge:separate_transforms",
+	"gui_light": "front",
+	"base": {
+		"parent": "superbwarfare:item/homemade_shotgun_base"
+	},
+	"perspectives": {
+		"gui": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		},
+		"thirdperson_righthand": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		},
+		"thirdperson_lefthand": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		},
+		"ground": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		},
+		"fixed": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		},
+		"head": {
+			"parent": "superbwarfare:item/homemade_shotgun3d"
+		}
+	}
+}

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

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "superbwarfare:item/abekiri",
-		"particle": "superbwarfare:item/abekiri"
+		"0": "superbwarfare:item/homemade_shotgun",
+		"particle": "superbwarfare:item/homemade_shotgun"
 	},
 	"elements": [
 		{
@@ -1824,7 +1824,7 @@
 	},
 	"groups": [
 		{
-			"name": "abekiri",
+			"name": "homemade_shotgun",
 			"origin": [7.37626, 3.80052, 8],
 			"color": 0,
 			"children": [

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

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

src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json

@@ -21,7 +21,7 @@
     }
   },
   "result": {
-    "item": "superbwarfare:abekiri",
+    "item": "superbwarfare:homemade_shotgun",
     "count": 1
   }
 }