From a215afc474efc3e62c1b54a6af67c223f7676ccb Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 16 Mar 2025 02:29:03 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/layer/AbekiriLayer.java | 8 +++--- .../client/model/item/AbekiriItemModel.java | 12 ++++----- .../renderer/item/AbekiriItemRenderer.java | 14 +++++----- .../datagen/ModItemTagProvider.java | 6 ++--- .../superbwarfare/event/GunEventHandler.java | 12 +++++++++ .../superbwarfare/init/ModItems.java | 4 +-- .../superbwarfare/init/ModSounds.java | 12 ++++----- .../atsuishio/superbwarfare/init/ModTabs.java | 4 +-- ...kiriItem.java => HomemadeShotgunItem.java} | 16 ++++++------ .../network/message/ShootMessage.java | 2 +- .../assets/superbwarfare/sounds.json | 24 +++++++++--------- .../homemade_shotgun_far.ogg} | Bin .../homemade_shotgun_fire_1p.ogg} | Bin .../homemade_shotgun_fire_3p.ogg} | Bin .../homemade_shotgun_reload_empty.ogg} | Bin .../homemade_shotgun_reload_normal.ogg} | Bin .../homemade_shotgun_veryfar.ogg} | Bin ...iri_icon.png => homemade_shotgun_icon.png} | Bin .../{abekiri.json => homemade_shotgun.json} | 0 19 files changed, 63 insertions(+), 51 deletions(-) rename src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/{AbekiriItem.java => HomemadeShotgunItem.java} (90%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_far.ogg => homemade_shotgun/homemade_shotgun_far.ogg} (100%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_fire_1p.ogg => homemade_shotgun/homemade_shotgun_fire_1p.ogg} (100%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_fire_3p.ogg => homemade_shotgun/homemade_shotgun_fire_3p.ogg} (100%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_reload_empty.ogg => homemade_shotgun/homemade_shotgun_reload_empty.ogg} (100%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_reload_normal.ogg => homemade_shotgun/homemade_shotgun_reload_normal.ogg} (100%) rename src/main/resources/assets/superbwarfare/sounds/{abekiri/abekiri_veryfar.ogg => homemade_shotgun/homemade_shotgun_veryfar.ogg} (100%) rename src/main/resources/assets/superbwarfare/textures/gun_icon/{abekiri_icon.png => homemade_shotgun_icon.png} (100%) rename src/main/resources/data/superbwarfare/guns/{abekiri.json => homemade_shotgun.json} (100%) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java index 297a5032c..60fb635ca 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; +import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; @@ -12,15 +12,15 @@ 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 { +public class AbekiriLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = ModUtils.loc("textures/item/abekiri_e.png"); - public AbekiriLayer(GeoRenderer entityRenderer) { + public AbekiriLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, AbekiriItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, HomemadeShotgunItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { RenderType glowRenderType = RenderType.eyes(LAYER); getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java index 62bcf7779..8df776b4e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java @@ -5,7 +5,7 @@ import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; +import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -15,25 +15,25 @@ 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 AbekiriItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(AbekiriItem animatable) { + public ResourceLocation getAnimationResource(HomemadeShotgunItem animatable) { return ModUtils.loc("animations/abekiri.animation.json"); } @Override - public ResourceLocation getModelResource(AbekiriItem animatable) { + public ResourceLocation getModelResource(HomemadeShotgunItem animatable) { return ModUtils.loc("geo/abekiri.geo.json"); } @Override - public ResourceLocation getTextureResource(AbekiriItem animatable) { + public ResourceLocation getTextureResource(HomemadeShotgunItem animatable) { return ModUtils.loc("textures/item/abekiri.png"); } @Override - public void setCustomAnimations(AbekiriItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(HomemadeShotgunItem animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java index d8c16e948..880165cd2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AbekiriItemRenderer.java @@ -5,7 +5,7 @@ import com.atsuishio.superbwarfare.client.layer.AbekiriLayer; import com.atsuishio.superbwarfare.client.model.item.AbekiriItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; +import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; @@ -27,7 +27,7 @@ import software.bernie.geckolib.util.RenderUtils; import java.util.HashSet; import java.util.Set; -public class AbekiriItemRenderer extends GeoItemRenderer { +public class AbekiriItemRenderer extends GeoItemRenderer { public AbekiriItemRenderer() { super(new AbekiriItemModel()); @@ -35,7 +35,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { } @Override - public RenderType getRenderType(AbekiriItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(HomemadeShotgunItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -44,7 +44,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected AbekiriItem animatable; + protected HomemadeShotgunItem animatable; private final Set hiddenBones = new HashSet<>(); @Override @@ -56,7 +56,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, AbekiriItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, HomemadeShotgunItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) { this.currentBuffer = renderTypeBuffer; this.renderType = type; @@ -68,7 +68,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { } @Override - public void renderRecursively(PoseStack stack, AbekiriItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + public void renderRecursively(PoseStack stack, HomemadeShotgunItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) { Minecraft mc = Minecraft.getInstance(); String name = bone.getName(); @@ -132,7 +132,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(AbekiriItem instance) { + public ResourceLocation getTextureLocation(HomemadeShotgunItem instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index 51db13f5b..1be6cdc89 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -87,11 +87,11 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.HEAVY_WEAPON).add(ModItems.NTW_20.get()); - this.tag(ModTags.Items.SHOTGUN).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.SHOTGUN).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); this.tag(ModTags.Items.MACHINE_GUN).add(ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.RPK.get(), ModItems.M_60.get()); - this.tag(ModTags.Items.NORMAL_GUN).add(ModItems.ABEKIRI.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), + this.tag(ModTags.Items.NORMAL_GUN).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.TRACHELIUM.get(), ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.M_870.get(), ModItems.MARLIN.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get(), ModItems.MP_443.get()); @@ -101,7 +101,7 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.USE_RIFLE_AMMO).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get(), ModItems.RPK.get(), ModItems.TRACHELIUM.get()); - this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); this.tag(ModTags.Items.USE_SNIPER_AMMO).add(ModItems.HUNTING_RIFLE.get(), ModItems.SENTINEL.get(), ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index d185a0b63..e64c98168 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -17,6 +17,7 @@ import com.atsuishio.superbwarfare.tools.AmmoType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.SoundTool; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -26,6 +27,7 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; import net.minecraft.world.phys.Vec3; @@ -35,6 +37,7 @@ import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.MissingMappingsEvent; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicBoolean; @@ -924,4 +927,13 @@ public class GunEventHandler { GunsTool.setGunBooleanTag(stack, "Charging", false); } } + + @SubscribeEvent + public static void onMissingMappings(MissingMappingsEvent event) { + for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(Registries.ITEM)) { + if (ModUtils.MODID.equals(mapping.getKey().getNamespace()) && mapping.getKey().getPath().equals("abekiri")) { + mapping.remap(ModItems.HOMEMADE_SHOTGUN.get()); + } + } + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 79da98e83..179cb2810 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -18,7 +18,7 @@ import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; import com.atsuishio.superbwarfare.item.gun.rifle.*; import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; +import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; import com.atsuishio.superbwarfare.item.gun.smg.VectorItem; import com.atsuishio.superbwarfare.item.gun.sniper.*; @@ -51,7 +51,7 @@ public class ModItems { public static final RegistryObject GLOCK_18 = GUNS.register("glock_18", Glock18Item::new); public static final RegistryObject MP_443 = GUNS.register("mp_443", Mp443Item::new); public static final RegistryObject M_1911 = GUNS.register("m_1911", M1911Item::new); - public static final RegistryObject ABEKIRI = GUNS.register("abekiri", AbekiriItem::new); + public static final RegistryObject HOMEMADE_SHOTGUN = GUNS.register("homemade_shotgun", HomemadeShotgunItem::new); public static final RegistryObject TRACHELIUM = GUNS.register("trachelium", Trachelium::new); public static final RegistryObject VECTOR = GUNS.register("vector", VectorItem::new); public static final RegistryObject AK_47 = GUNS.register("ak_47", AK47Item::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java index 8b6149abb..a56a1df81 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java @@ -70,12 +70,12 @@ public class ModSounds { public static final RegistryObject SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_far"))); public static final RegistryObject SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_veryfar"))); - public static final RegistryObject ABEKIRI_FIRE_1P = REGISTRY.register("abekiri_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_fire_1p"))); - public static final RegistryObject ABEKIRI_FIRE_3P = REGISTRY.register("abekiri_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_fire_3p"))); - public static final RegistryObject ABEKIRI_FAR = REGISTRY.register("abekiri_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_far"))); - public static final RegistryObject ABEKIRI_VERYFAR = REGISTRY.register("abekiri_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_veryfar"))); - public static final RegistryObject ABEKIRI_RELOAD_NORMAL = REGISTRY.register("abekiri_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_reload_normal"))); - public static final RegistryObject ABEKIRI_RELOAD_EMPTY = REGISTRY.register("abekiri_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("abekiri_reload_empty"))); + public static final RegistryObject HOMEMADE_SHOTGUN_FIRE_1P = REGISTRY.register("homemade_shotgun_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_fire_1p"))); + public static final RegistryObject HOMEMADE_SHOTGUN_FIRE_3P = REGISTRY.register("homemade_shotgun_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_fire_3p"))); + public static final RegistryObject HOMEMADE_SHOTGUN_FAR = REGISTRY.register("homemade_shotgun_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_far"))); + public static final RegistryObject HOMEMADE_SHOTGUN_VERYFAR = REGISTRY.register("homemade_shotgun_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_veryfar"))); + public static final RegistryObject HOMEMADE_SHOTGUN_NORMAL = REGISTRY.register("homemade_shotgun_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_reload_normal"))); + public static final RegistryObject HOMEMADE_SHOTGUN_RELOAD_EMPTY = REGISTRY.register("homemade_shotgun_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_reload_empty"))); public static final RegistryObject AK_47_FIRE_1P = REGISTRY.register("ak_47_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_1p"))); public static final RegistryObject AK_47_FIRE_3P = REGISTRY.register("ak_47_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_3p"))); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java index 628f996c0..d55d71bbe 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java @@ -15,7 +15,7 @@ import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; import com.atsuishio.superbwarfare.item.gun.rifle.*; import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; +import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; import com.atsuishio.superbwarfare.item.gun.smg.VectorItem; import com.atsuishio.superbwarfare.item.gun.sniper.*; @@ -57,7 +57,7 @@ public class ModTabs { output.accept(Glock18Item.getGunInstance()); output.accept(M1911Item.getGunInstance()); output.accept(Mp443Item.getGunInstance()); - output.accept(AbekiriItem.getGunInstance()); + output.accept(HomemadeShotgunItem.getGunInstance()); output.accept(Trachelium.getGunInstance()); output.accept(VectorItem.getGunInstance()); output.accept(SksItem.getGunInstance()); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java similarity index 90% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java rename to src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java index b6a3d6d45..7f2b9ccdb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java @@ -41,17 +41,17 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class AbekiriItem extends GunItem implements GeoItem { +public class HomemadeShotgunItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @Override public Set getReloadSound() { - return Set.of(ModSounds.ABEKIRI_RELOAD_EMPTY.get(), ModSounds.ABEKIRI_RELOAD_NORMAL.get()); + return Set.of(ModSounds.HOMEMADE_SHOTGUN_RELOAD_EMPTY.get(), ModSounds.HOMEMADE_SHOTGUN_NORMAL.get()); } - public AbekiriItem() { + public HomemadeShotgunItem() { super(new Item.Properties().durability(24).rarity(Rarity.COMMON)); } @@ -77,7 +77,7 @@ public class AbekiriItem extends GunItem implements GeoItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -114,19 +114,19 @@ public class AbekiriItem extends GunItem implements GeoItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(ModItems.ABEKIRI.get()); - GunsTool.initCreativeGun(stack, ModItems.ABEKIRI.getId().getPath()); + ItemStack stack = new ItemStack(ModItems.HOMEMADE_SHOTGUN.get()); + GunsTool.initCreativeGun(stack, ModItems.HOMEMADE_SHOTGUN.getId().getPath()); return stack; } @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/abekiri_icon.png"); + return ModUtils.loc("textures/gun_icon/homemade_shotgun_icon.png"); } @Override public String getGunDisplayName() { - return "Abekiri"; + return "Homemade Shotgun"; } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java index d734b95db..0339975e9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java @@ -79,7 +79,7 @@ public class ShootMessage { GunsTool.setGunBooleanTag(stack, "HideBulletChain", true); } - if (stack.getItem() == ModItems.ABEKIRI.get()) { + if (stack.getItem() == ModItems.HOMEMADE_SHOTGUN.get()) { stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(InteractionHand.MAIN_HAND)); if (player instanceof ServerPlayer serverPlayer && player.level() instanceof ServerLevel serverLevel) { ParticleTool.sendParticle(serverLevel, ParticleTypes.CLOUD, player.getX() + 1.8 * player.getLookAngle().x, player.getY() + player.getBbHeight() - 0.1 + 1.8 * player.getLookAngle().y, diff --git a/src/main/resources/assets/superbwarfare/sounds.json b/src/main/resources/assets/superbwarfare/sounds.json index 8a5e364bb..bc3fa88ab 100644 --- a/src/main/resources/assets/superbwarfare/sounds.json +++ b/src/main/resources/assets/superbwarfare/sounds.json @@ -223,50 +223,50 @@ } ] }, - "abekiri_fire_1p": { + "homemade_shotgun_fire_1p": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_fire_1p", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_fire_1p", "stream": false } ] }, - "abekiri_fire_3p": { + "homemade_shotgun_fire_3p": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_fire_3p", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_fire_3p", "stream": false } ] }, - "abekiri_far": { + "homemade_shotgun_far": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_far", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_far", "stream": false } ] }, - "abekiri_veryfar": { + "homemade_shotgun_veryfar": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_veryfar", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_veryfar", "stream": false } ] }, - "abekiri_reload_normal": { + "homemade_shotgun_reload_normal": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_reload_normal", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_reload_normal", "stream": false } ] }, - "abekiri_reload_empty": { + "homemade_shotgun_reload_empty": { "sounds": [ { - "name": "superbwarfare:abekiri/abekiri_reload_empty", + "name": "superbwarfare:homemade_shotgun/homemade_shotgun_reload_empty", "stream": false } ] diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_far.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_far.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_far.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_far.ogg diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_fire_1p.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_fire_1p.ogg diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_fire_3p.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_fire_3p.ogg diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_reload_empty.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_reload_empty.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_reload_empty.ogg diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_reload_normal.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_reload_normal.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_reload_normal.ogg diff --git a/src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_veryfar.ogg b/src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_veryfar.ogg similarity index 100% rename from src/main/resources/assets/superbwarfare/sounds/abekiri/abekiri_veryfar.ogg rename to src/main/resources/assets/superbwarfare/sounds/homemade_shotgun/homemade_shotgun_veryfar.ogg diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/abekiri_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/homemade_shotgun_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/gun_icon/abekiri_icon.png rename to src/main/resources/assets/superbwarfare/textures/gun_icon/homemade_shotgun_icon.png diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json similarity index 100% rename from src/main/resources/data/superbwarfare/guns/abekiri.json rename to src/main/resources/data/superbwarfare/guns/homemade_shotgun.json