From b2f72ab7db3a8fcb73ca70e5765865b48098bebf Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 16 Mar 2025 02:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E7=89=A9?= =?UTF-8?q?=E5=93=81=E5=91=BD=E5=90=8D#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/superbwarfare/tags/items/gun.json | 2 +- .../superbwarfare/tags/items/normal_gun.json | 2 +- .../superbwarfare/tags/items/shotgun.json | 2 +- .../tags/items/use_shotgun_ammo.json | 2 +- ...riLayer.java => HomemadeShotgunLayer.java} | 7 +++-- ...del.java => HomemadeShotgunItemModel.java} | 9 +++--- ....java => HomemadeShotgunItemRenderer.java} | 12 ++++---- .../item/gun/shotgun/HomemadeShotgunItem.java | 4 +-- ...n.json => homemade_shotgun.animation.json} | 0 ...iri.geo.json => homemade_shotgun.geo.json} | 6 ++-- .../assets/superbwarfare/lang/en_us.json | 2 +- .../assets/superbwarfare/lang/zh_cn.json | 2 +- ...i.item.json => homemade_shotgun.item.json} | 0 .../superbwarfare/models/item/abekiri.json | 27 ------------------ .../models/item/abekiri_base.json | 6 ---- .../models/item/homemade_shotgun.json | 27 ++++++++++++++++++ ...abekiri3d.json => homemade_shotgun3d.json} | 6 ++-- .../models/item/homemade_shotgun_base.json | 6 ++++ .../{abekiri.png => homemade_shotgun.png} | Bin .../{abekiri_e.png => homemade_shotgun_e.png} | Bin ...ng.json => homemade_shotgun_crafting.json} | 2 +- 21 files changed, 62 insertions(+), 62 deletions(-) rename src/main/java/com/atsuishio/superbwarfare/client/layer/{AbekiriLayer.java => HomemadeShotgunLayer.java} (86%) rename src/main/java/com/atsuishio/superbwarfare/client/model/item/{AbekiriItemModel.java => HomemadeShotgunItemModel.java} (93%) rename src/main/java/com/atsuishio/superbwarfare/client/renderer/item/{AbekiriItemRenderer.java => HomemadeShotgunItemRenderer.java} (94%) rename src/main/resources/assets/superbwarfare/animations/{abekiri.animation.json => homemade_shotgun.animation.json} (100%) rename src/main/resources/assets/superbwarfare/geo/{abekiri.geo.json => homemade_shotgun.geo.json} (99%) rename src/main/resources/assets/superbwarfare/models/displaysettings/{abekiri.item.json => homemade_shotgun.item.json} (100%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/abekiri.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/abekiri_base.json create mode 100644 src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json rename src/main/resources/assets/superbwarfare/models/item/{abekiri3d.json => homemade_shotgun3d.json} (99%) create mode 100644 src/main/resources/assets/superbwarfare/models/item/homemade_shotgun_base.json rename src/main/resources/assets/superbwarfare/textures/item/{abekiri.png => homemade_shotgun.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{abekiri_e.png => homemade_shotgun_e.png} (100%) rename src/main/resources/data/superbwarfare/recipes/{abekiri_crafting.json => homemade_shotgun_crafting.json} (89%) diff --git a/src/generated/resources/data/superbwarfare/tags/items/gun.json b/src/generated/resources/data/superbwarfare/tags/items/gun.json index be28b2fbe..28a9aa89c 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/gun.json +++ b/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", diff --git a/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json b/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json index a1394c85e..51e3373e0 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json +++ b/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", diff --git a/src/generated/resources/data/superbwarfare/tags/items/shotgun.json b/src/generated/resources/data/superbwarfare/tags/items/shotgun.json index a208906cd..9bca8d632 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/shotgun.json +++ b/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" ] diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json b/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json index a208906cd..9bca8d632 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json +++ b/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" ] diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/HomemadeShotgunLayer.java similarity index 86% rename from src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java rename to src/main/java/com/atsuishio/superbwarfare/client/layer/HomemadeShotgunLayer.java index 60fb635ca..ed7fdeb0b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java +++ b/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 { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/abekiri_e.png"); +public class HomemadeShotgunLayer extends GeoRenderLayer { - public AbekiriLayer(GeoRenderer entityRenderer) { + private static final ResourceLocation LAYER = ModUtils.loc("textures/item/homemade_shotgun_e.png"); + + public HomemadeShotgunLayer(GeoRenderer entityRenderer) { super(entityRenderer); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java similarity index 93% rename from src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java rename to src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java index 8df776b4e..396a8c5ee 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/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 { +public class HomemadeShotgunItemModel extends GeoModel { @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 { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java similarity index 94% rename from src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java rename to src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java index 880165cd2..9f388c8fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java +++ b/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 { +public class HomemadeShotgunItemRenderer extends GeoItemRenderer { - public AbekiriItemRenderer() { - super(new AbekiriItemModel()); - this.addRenderLayer(new AbekiriLayer(this)); + public HomemadeShotgunItemRenderer() { + super(new HomemadeShotgunItemModel()); + this.addRenderLayer(new HomemadeShotgunLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java index 7f2b9ccdb..2f9a22708 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java +++ b/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 consumer) { super.initializeClient(consumer); consumer.accept(new IClientItemExtensions() { - private final BlockEntityWithoutLevelRenderer renderer = new AbekiriItemRenderer(); + private final BlockEntityWithoutLevelRenderer renderer = new HomemadeShotgunItemRenderer(); @Override public BlockEntityWithoutLevelRenderer getCustomRenderer() { diff --git a/src/main/resources/assets/superbwarfare/animations/abekiri.animation.json b/src/main/resources/assets/superbwarfare/animations/homemade_shotgun.animation.json similarity index 100% rename from src/main/resources/assets/superbwarfare/animations/abekiri.animation.json rename to src/main/resources/assets/superbwarfare/animations/homemade_shotgun.animation.json diff --git a/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json b/src/main/resources/assets/superbwarfare/geo/homemade_shotgun.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/abekiri.geo.json rename to src/main/resources/assets/superbwarfare/geo/homemade_shotgun.geo.json index 4aacb0510..091a72301 100644 --- a/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json +++ b/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] }, { diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index fb1c7aa5b..92bfb08e0 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/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\"", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 0a9d60685..e44e89c85 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/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": "“愿手中的这束花，能够传达我的深情”", diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json rename to src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json diff --git a/src/main/resources/assets/superbwarfare/models/item/abekiri.json b/src/main/resources/assets/superbwarfare/models/item/abekiri.json deleted file mode 100644 index d03ef83ad..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/abekiri.json +++ /dev/null @@ -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" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json b/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json deleted file mode 100644 index bf57be8bc..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "superbwarfare:displaysettings/abekiri.item", - "textures": { - "layer0": "superbwarfare:item/abekiri" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json b/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json new file mode 100644 index 000000000..0299c2164 --- /dev/null +++ b/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" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/abekiri3d.json b/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun3d.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/abekiri3d.json rename to src/main/resources/assets/superbwarfare/models/item/homemade_shotgun3d.json index 929724f4c..0724ece3f 100644 --- a/src/main/resources/assets/superbwarfare/models/item/abekiri3d.json +++ b/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": [ diff --git a/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun_base.json b/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun_base.json new file mode 100644 index 000000000..e985fd55d --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/abekiri.png b/src/main/resources/assets/superbwarfare/textures/item/homemade_shotgun.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/abekiri.png rename to src/main/resources/assets/superbwarfare/textures/item/homemade_shotgun.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/abekiri_e.png b/src/main/resources/assets/superbwarfare/textures/item/homemade_shotgun_e.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/abekiri_e.png rename to src/main/resources/assets/superbwarfare/textures/item/homemade_shotgun_e.png diff --git a/src/main/resources/data/superbwarfare/recipes/abekiri_crafting.json b/src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/abekiri_crafting.json rename to src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json index 2f8d13e97..45eab5679 100644 --- a/src/main/resources/data/superbwarfare/recipes/abekiri_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:abekiri", + "item": "superbwarfare:homemade_shotgun", "count": 1 } } \ No newline at end of file