From f629b9ced015970a1c01455da58040b1a61af148 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Fri, 20 Sep 2024 23:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=93=E6=B3=A8=E7=9A=84?=
 =?UTF-8?q?=E5=B0=84=E9=80=9F=E7=B4=AF=E5=8A=A0=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mcreator/superbwarfare/event/ClientEventHandler.java | 4 ++--
 .../mcreator/superbwarfare/network/message/FireMessage.java  | 4 ++++
 .../mcreator/superbwarfare/network/message/ShootMessage.java | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
index 8b88fe304..8df81b743 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
@@ -114,8 +114,8 @@ public class ClientEventHandler {
 
             double customRpm = 0;
 
-            if (stack.getItem() == ModItems.MARLIN.get() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
-                customRpm = -40;
+            if (stack.getItem() == ModItems.DEVOTION.get()) {
+                customRpm = stack.getOrCreateTag().getInt("customRpm");
             }
 
             double rpm = stack.getOrCreateTag().getDouble("rpm") + customRpm;
diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java
index 9c61edf3c..15710dadb 100644
--- a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java
+++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java
@@ -83,6 +83,10 @@ public class FireMessage {
                 handleBowShoot(player);
             }
 
+            if (player.getMainHandItem().getItem() == ModItems.DEVOTION.get()) {
+                player.getMainHandItem().getOrCreateTag().putDouble("customRpm", 0);
+            }
+
             if (player.getMainHandItem().getItem() == ModItems.JAVELIN.get()) {
                 var handItem = player.getMainHandItem();
                 var tag = handItem.getOrCreateTag();
diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java
index 30208f19c..2dfe07e7f 100644
--- a/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java
+++ b/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java
@@ -8,6 +8,7 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -107,6 +108,10 @@ public class ShootMessage {
                     stack.getOrCreateTag().putBoolean("bullet_chain", true);
                 }
 
+                if (stack.getItem() == ModItems.DEVOTION.get()) {
+                    stack.getOrCreateTag().putInt("customRpm", Mth.clamp(stack.getOrCreateTag().getInt("customRpm") + 20, 0, 500));
+                }
+
                 if (stack.getItem() == ModItems.ABEKIRI.get()) {
                     stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(InteractionHand.MAIN_HAND));
                     if (player instanceof ServerPlayer serverPlayer && player.level() instanceof ServerLevel serverLevel) {