From 327bf86d2f829ef10f1c5ac3c7f315324b39e883 Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Tue, 17 Jun 2025 05:50:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor(bukkit):=20=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/projectile/TridentRelease.java | 24 +++++++++---------- .../reflection/minecraft/MSoundEvents.java | 20 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/TridentRelease.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/TridentRelease.java index 7dd749b4d..eaa7cdabd 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/TridentRelease.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/TridentRelease.java @@ -261,7 +261,7 @@ public class TridentRelease { level, null, entitythrowntrident, - MSoundEvents.instance$SoundEvent$TRIDENT_THROW, + MSoundEvents.TRIDENT_THROW, CoreReflections.instance$SoundSource$PLAYERS, 1.0F, 1.0F ); @@ -294,11 +294,11 @@ public class TridentRelease { Object soundeffect; if (spinStrength >= 3) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_3; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_3; } else if (spinStrength == 2) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_2; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_2; } else { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_1; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_1; } FastNMS.INSTANCE.method$Level$playSound( @@ -362,7 +362,7 @@ public class TridentRelease { level, null, entitythrowntrident, - MSoundEvents.instance$SoundEvent$TRIDENT_THROW, + MSoundEvents.TRIDENT_THROW, CoreReflections.instance$SoundSource$PLAYERS, 1.0F, 1.0F ); @@ -395,11 +395,11 @@ public class TridentRelease { Object soundeffect; if (spinStrength >= 3) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_3; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_3; } else if (spinStrength == 2) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_2; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_2; } else { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_1; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_1; } FastNMS.INSTANCE.method$Level$playSound( @@ -463,7 +463,7 @@ public class TridentRelease { level, null, entitythrowntrident, - MSoundEvents.instance$SoundEvent$TRIDENT_THROW, + MSoundEvents.TRIDENT_THROW, CoreReflections.instance$SoundSource$PLAYERS, 1.0F, 1.0F ); @@ -495,11 +495,11 @@ public class TridentRelease { Object soundeffect; if (spinStrength >= 3) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_3; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_3; } else if (spinStrength == 2) { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_2; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_2; } else { - soundeffect = MSoundEvents.instance$SoundEvent$TRIDENT_RIPTIDE_1; + soundeffect = MSoundEvents.TRIDENT_RIPTIDE_1; } FastNMS.INSTANCE.method$Level$playSound( diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MSoundEvents.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MSoundEvents.java index 36b6777ab..dbdc932e4 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MSoundEvents.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MSoundEvents.java @@ -6,11 +6,11 @@ import net.momirealms.craftengine.bukkit.plugin.reflection.ReflectionInitExcepti public final class MSoundEvents { private MSoundEvents() {} - public static final Object instance$SoundEvent$EMPTY; - public static final Object instance$SoundEvent$TRIDENT_RIPTIDE_1; - public static final Object instance$SoundEvent$TRIDENT_RIPTIDE_2; - public static final Object instance$SoundEvent$TRIDENT_RIPTIDE_3; - public static final Object instance$SoundEvent$TRIDENT_THROW; + public static final Object EMPTY; + public static final Object TRIDENT_RIPTIDE_1; + public static final Object TRIDENT_RIPTIDE_2; + public static final Object TRIDENT_RIPTIDE_3; + public static final Object TRIDENT_THROW; private static Object getById(String id) throws ReflectiveOperationException { Object rl = FastNMS.INSTANCE.method$ResourceLocation$fromNamespaceAndPath("minecraft", id); @@ -19,11 +19,11 @@ public final class MSoundEvents { static { try { - instance$SoundEvent$EMPTY = getById("intentionally_empty"); - instance$SoundEvent$TRIDENT_RIPTIDE_1 = getById("item.trident_riptide_1"); - instance$SoundEvent$TRIDENT_RIPTIDE_2 = getById("item.trident_riptide_2"); - instance$SoundEvent$TRIDENT_RIPTIDE_3 = getById("item.trident.riptide_3"); - instance$SoundEvent$TRIDENT_THROW = getById("item.trident.throw"); + EMPTY = getById("intentionally_empty"); + TRIDENT_RIPTIDE_1 = getById("item.trident_riptide_1"); + TRIDENT_RIPTIDE_2 = getById("item.trident_riptide_2"); + TRIDENT_RIPTIDE_3 = getById("item.trident.riptide_3"); + TRIDENT_THROW = getById("item.trident.throw"); } catch (ReflectiveOperationException e) { throw new ReflectionInitException("Failed to init SoundEvents", e); }