Scorpion, bed bug, creeping horror overhaul. Pill bug assets.

Big Bertha mode switching bug. Gravity gun keybind bug

fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java

@@ -334,6 +334,7 @@ public final class AntarchyFabricClientBootstrap {
             HerculesBeetleClientHandler.tick();
         });
 
+        BigBerthaClientHandler.register();
         GravityGunClientHandler.register();
 
         ElythiaFireflyManager.register();

fabric/src/main/java/com/craisinlord/antarchy/fabric/client/BigBerthaClientHandler.java

@@ -0,0 +1,39 @@
+package com.craisinlord.antarchy.fabric.client;
+
+import com.craisinlord.antarchy.content.item.BigBerthaItem;
+import com.craisinlord.antarchy.content.network.BigBerthaModeCyclePayload;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.minecraft.client.Minecraft;
+
+public final class BigBerthaClientHandler {
+    private static boolean lastUseDown;
+
+    private BigBerthaClientHandler() {
+    }
+
+    public static void register() {
+        ClientTickEvents.END_CLIENT_TICK.register(BigBerthaClientHandler::tick);
+    }
+
+    private static void tick(Minecraft mc) {
+        if (mc.player == null || mc.level == null || mc.screen != null) {
+            lastUseDown = false;
+            return;
+        }
+
+        if (!(mc.player.getMainHandItem().getItem() instanceof BigBerthaItem)) {
+            lastUseDown = false;
+            return;
+        }
+
+        boolean useDown = mc.options.keyUse.isDown();
+        if (useDown
+                && !lastUseDown
+                && mc.player.isShiftKeyDown()
+                && mc.player.getCooldowns().isOnCooldown(mc.player.getMainHandItem().getItem())) {
+            ClientPlayNetworking.send(new BigBerthaModeCyclePayload());
+        }
+        lastUseDown = useDown;
+    }
+}

fabric/src/main/java/com/craisinlord/antarchy/fabric/client/GravityGunClientHandler.java

@@ -9,7 +9,6 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.util.Mth;
-import org.lwjgl.glfw.GLFW;
 
 public final class GravityGunClientHandler {
     private static final double SCROLL_STEP_DISTANCE = 0.75D;
@@ -34,8 +33,7 @@ public final class GravityGunClientHandler {
             return;
         }
 
-        long window = mc.getWindow().getWindow();
-        boolean attackDown = org.lwjgl.glfw.GLFW.glfwGetMouseButton(window, GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS;
+        boolean attackDown = mc.options.keyAttack.isDown();
         if (attackDown && !lastAttackDown) {
             ClientPlayNetworking.send(new GravityGunPrimaryPayload());
         }

fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java

@@ -54,6 +54,7 @@ public final class AntarchyFabricNetworking {
 
         PayloadTypeRegistry.playC2S().register(GravityGunPrimaryPayload.TYPE, GravityGunPrimaryPayload.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(GravityGunScrollPayload.TYPE, GravityGunScrollPayload.STREAM_CODEC);
+        PayloadTypeRegistry.playC2S().register(BigBerthaModeCyclePayload.TYPE, BigBerthaModeCyclePayload.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(DiamondMinecartInputPayload.TYPE, DiamondMinecartInputPayload.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(BrutalflyElytraFlapPayload.TYPE, BrutalflyElytraFlapPayload.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(JumpyBootsLaunchPayload.TYPE, JumpyBootsLaunchPayload.STREAM_CODEC);
@@ -71,6 +72,8 @@ public final class AntarchyFabricNetworking {
                 context.server().execute(() -> handleGravityGunPrimary(context.player(), payload)));
         ServerPlayNetworking.registerGlobalReceiver(GravityGunScrollPayload.TYPE, (payload, context) ->
                 context.server().execute(() -> handleGravityGunScroll(context.player(), payload)));
+        ServerPlayNetworking.registerGlobalReceiver(BigBerthaModeCyclePayload.TYPE, (payload, context) ->
+                context.server().execute(() -> handleBigBerthaModeCycle(context.player(), payload)));
         ServerPlayNetworking.registerGlobalReceiver(DiamondMinecartInputPayload.TYPE, (payload, context) ->
                 context.server().execute(() -> handleDiamondMinecartInput(context.player(), payload)));
         ServerPlayNetworking.registerGlobalReceiver(BrutalflyElytraFlapPayload.TYPE, (payload, context) ->
@@ -190,6 +193,13 @@ public final class AntarchyFabricNetworking {
         GravityGunItem.adjustHeldDistance(player.getMainHandItem(), payload.distanceDelta());
     }
 
+    private static void handleBigBerthaModeCycle(ServerPlayer player, BigBerthaModeCyclePayload payload) {
+        if (!(player.getMainHandItem().getItem() instanceof BigBerthaItem bigBerthaItem)) {
+            return;
+        }
+        bigBerthaItem.tryCycleModeWhileCoolingDown(player.serverLevel(), player, player.getMainHandItem());
+    }
+
     private static void handleDiamondMinecartInput(ServerPlayer player, DiamondMinecartInputPayload payload) {
         if (player.getVehicle() instanceof DiamondMinecartEntity cart) {
             cart.onInputReceived(payload.inputFlags());