From b32e0edc69ee551d37d59faaed118fb18f3bbffc Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 8 Nov 2024 20:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9F=B3=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.cache/2e07f3c482445536d45c00e6abf223465c01c841 | 4 ++-- .../superbwarfare/tags/items/has_shell_effect.json | 3 ++- .../superbwarfare/datagen/ModItemTagProvider.java | 2 +- .../superbwarfare/event/ClientEventHandler.java | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index f45dbbac6..b3102213b 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2024-11-06T16:27:03.7101082 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-11-08T20:06:16.3248238 Tags for minecraft:item mod id superbwarfare cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json 295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json @@ -36,7 +36,7 @@ af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/le dff9ff6d6637951191906cb55a210ae5a3ad5cd6 data/superbwarfare/tags/items/extra_one_ammo.json 52598e22974c8da0d2852defe4c9005e1d67744b data/superbwarfare/tags/items/gun.json 62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json -49fbb8c030fdfafec1f291acc1cdff406c777c7e data/superbwarfare/tags/items/has_shell_effect.json +835c071e873ee7061e36e1361026897b39487bd6 data/superbwarfare/tags/items/has_shell_effect.json dae3f86663e841d336efff9d23d8910aa7247be5 data/superbwarfare/tags/items/is_auto_weapon.json 68ec25b0ccd68abbbe2f33ab7097572c2140c9da data/superbwarfare/tags/items/launcher.json b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/has_shell_effect.json b/src/generated/resources/data/superbwarfare/tags/items/has_shell_effect.json index 6e863343a..daf4d39a1 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/has_shell_effect.json +++ b/src/generated/resources/data/superbwarfare/tags/items/has_shell_effect.json @@ -15,6 +15,7 @@ "superbwarfare:glock_17", "superbwarfare:glock_18", "superbwarfare:m_1911", - "superbwarfare:qbz_95" + "superbwarfare:qbz_95", + "superbwarfare:minigun" ] } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java index 77548e561..130e06405 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -112,7 +112,7 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.HAS_SHELL_EFFECT).add(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.GLOCK_17.get(), - ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get()); + ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.MINIGUN.get()); this.tag(ModTags.Items.MILITARY_ARMOR).add(ModItems.RU_CHEST_6B43.get(), ModItems.US_CHEST_IOTV.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 22649ea47..279863f23 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -347,10 +347,10 @@ public class ClientEventHandler { var perk = PerkHelper.getPerkByType(stack, Perk.Type.AMMO); float pitch = tag.getDouble("heat") <= 40 ? 1 : (float) (1 - 0.025 * Math.abs(40 - tag.getDouble("heat"))); - player.playSound(ModSounds.MINIGUN_FIRE_1P.get(), 2f, pitch); + player.playSound(ModSounds.MINIGUN_FIRE_1P.get(), 1f, pitch); if (perk == ModPerks.BEAST_BULLET.get()) { - player.playSound(ModSounds.HENG.get(), 4f, 1f); + player.playSound(ModSounds.HENG.get(), 1f, 1f); } } @@ -405,7 +405,7 @@ public class ClientEventHandler { if (charged.get()) { SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, "sentinel_charge_fire_1p")); if (sound1p != null) { - player.playSound(sound1p, 2, 1); + player.playSound(sound1p, 0.4f, 1); } return; } @@ -414,7 +414,7 @@ public class ClientEventHandler { var perk = PerkHelper.getPerkByType(stack, Perk.Type.AMMO); if (perk == ModPerks.BEAST_BULLET.get()) { - player.playSound(ModSounds.HENG.get(), 4f, 1f); + player.playSound(ModSounds.HENG.get(), 1f, 1f); } int barrelType = GunsTool.getAttachmentType(stack, GunsTool.AttachmentType.BARREL); @@ -422,7 +422,7 @@ public class ClientEventHandler { SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(ModUtils.loc(name + (barrelType == 2 ? "_fire_1p_s" : "_fire_1p"))); if (sound1p != null) { - player.playSound(sound1p, 2, 1); + player.playSound(sound1p, 0.4f, 1); } double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip( new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1 , 0).scale(10)),