charge storage is now reset when letting go of RMB

splatcraft · Mar 3, 2024 · b461041 · b461041
1 parent 508ddb3
commit b461041
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/net/splatcraft/forge/client/handlers/SplatcraftKeyHandler.java b/src/main/java/net/splatcraft/forge/client/handlers/SplatcraftKeyHandler.java
@@ -29,8 +29,10 @@
 import net.splatcraft.forge.mixin.MinecraftClientAccessor;
 import net.splatcraft.forge.network.SplatcraftPacketHandler;
 import net.splatcraft.forge.network.c2s.SwapSlotWithOffhandPacket;
+import net.splatcraft.forge.network.c2s.UpdateChargeStatePacket;
 import net.splatcraft.forge.util.ClientUtils;
 import net.splatcraft.forge.util.CommonUtils;
+import net.splatcraft.forge.util.PlayerCharge;
 import net.splatcraft.forge.util.PlayerCooldown;
 import org.lwjgl.glfw.GLFW;
 
@@ -65,14 +67,21 @@ public static boolean isSquidKeyDown() {
     }
 
     @SubscribeEvent
-    public static void onClientTick(TickEvent.ClientTickEvent event) {
+    public static void onClientTick(TickEvent.ClientTickEvent event)
+    {
         Minecraft mc = Minecraft.getInstance();
         Player player = mc.player;
 
         if (player == null || player.isSpectator() || !PlayerInfoCapability.hasCapability(player)) {
             return;
         }
 
+        if(!mc.options.keyUse.isDown() && PlayerCharge.hasCharge(player) && PlayerInfoCapability.isSquid(player)) //Resets weapon charge when player is in swim form and not holding down right click. Used to void Charge Storage for Splatlings and Chargers.
+        {
+            PlayerCharge.getCharge(player).reset();
+            SplatcraftPacketHandler.sendToServer(new UpdateChargeStatePacket(false));
+        }
+
         boolean canHold = canHoldKeys(Minecraft.getInstance());
 
         fireKey.tick(KeyMode.HOLD, canHold);

diff --git a/src/main/java/net/splatcraft/forge/items/weapons/SplatlingItem.java b/src/main/java/net/splatcraft/forge/items/weapons/SplatlingItem.java
@@ -18,6 +18,7 @@
 import net.minecraftforge.registries.RegistryObject;
 import net.splatcraft.forge.client.audio.SplatlingChargingTickableSound;
 import net.splatcraft.forge.client.handlers.SplatcraftKeyHandler;
+import net.splatcraft.forge.data.capabilities.playerinfo.PlayerInfoCapability;
 import net.splatcraft.forge.entities.InkProjectileEntity;
 import net.splatcraft.forge.handlers.PlayerPosingHandler;
 import net.splatcraft.forge.items.InkTankItem;
@@ -201,16 +202,6 @@ public void releaseUsing(@NotNull ItemStack stack, @NotNull Level level, LivingE
 
 			if(charge == null)
 				return;
-
-			/*
-			if(PlayerInfoCapability.isSquid(player))
-			{
-				charge.reset();
-				SplatcraftPacketHandler.sendToServer(new UpdateChargeStatePacket(false));
-			}
-			else */
-
-
 			if (!SplatcraftKeyHandler.isSquidKeyDown() && charge.charge > 0.05f) //checking for squid key press so it doesn't immediately release charge when squidding
 			{
 				SplatlingWeaponSettings settings = getSettings(stack);