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

Big Bertha mode switching bug. Gravity gun keybind bug

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

@@ -0,0 +1,42 @@
+package com.craisinlord.antarchy.neoforge.client;
+
+import com.craisinlord.antarchy.Antarchy;
+import com.craisinlord.antarchy.content.item.BigBerthaItem;
+import com.craisinlord.antarchy.content.network.BigBerthaModeCyclePayload;
+import net.minecraft.client.Minecraft;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
+import net.neoforged.neoforge.network.PacketDistributor;
+
+@EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
+public final class BigBerthaClientHandler {
+    private static boolean lastUseDown;
+
+    private BigBerthaClientHandler() {
+    }
+
+    @SubscribeEvent
+    public static void onClientTick(ClientTickEvent.Post event) {
+        Minecraft mc = Minecraft.getInstance();
+        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())) {
+            PacketDistributor.sendToServer(new BigBerthaModeCyclePayload());
+        }
+        lastUseDown = useDown;
+    }
+}

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

@@ -8,37 +8,39 @@ import com.craisinlord.antarchy.content.network.GravityGunScrollPayload;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.util.Mth;
-import org.lwjgl.glfw.GLFW;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.InputEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
 
 @EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
 public final class GravityGunClientHandler {
     private static final double SCROLL_STEP_DISTANCE = 0.75D;
+    private static boolean lastAttackDown;
 
     private GravityGunClientHandler() {
     }
 
     @SubscribeEvent
-    public static void onMouseButton(InputEvent.MouseButton.Pre event) {
+    public static void onClientTick(ClientTickEvent.Post event) {
         Minecraft mc = Minecraft.getInstance();
         if (mc.player == null || mc.level == null || mc.screen != null || !AntarchySettings.gravityGunEnabled()) {
-            return;
-        }
-
-        if (event.getButton() != GLFW.GLFW_MOUSE_BUTTON_LEFT || event.getAction() != GLFW.GLFW_PRESS) {
+            lastAttackDown = false;
             return;
         }
 
         if (!(mc.player.getMainHandItem().getItem() instanceof GravityGunItem)) {
+            lastAttackDown = false;
             return;
         }
 
-        PacketDistributor.sendToServer(new GravityGunPrimaryPayload());
-        event.setCanceled(true);
+        boolean attackDown = mc.options.keyAttack.isDown();
+        if (attackDown && !lastAttackDown) {
+            PacketDistributor.sendToServer(new GravityGunPrimaryPayload());
+        }
+        lastAttackDown = attackDown;
     }
 
     @SubscribeEvent

neoforge/src/main/java/com/craisinlord/antarchy/neoforge/network/AntarchyGravityNetworking.java

@@ -2,7 +2,9 @@ package com.craisinlord.antarchy.neoforge.network;
 
 import com.craisinlord.antarchy.content.entity.DiamondMinecartEntity;
 import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi;
+import com.craisinlord.antarchy.content.item.BigBerthaItem;
 import com.craisinlord.antarchy.content.item.GravityGunItem;
+import com.craisinlord.antarchy.content.network.BigBerthaModeCyclePayload;
 import com.craisinlord.antarchy.content.network.GravityGunPrimaryPayload;
 import com.craisinlord.antarchy.content.network.GravityGunScrollPayload;
 import com.craisinlord.antarchy.content.network.GravityStatePayload;
@@ -29,6 +31,10 @@ public final class AntarchyGravityNetworking {
                 GravityGunScrollPayload.TYPE,
                 GravityGunScrollPayload.STREAM_CODEC,
                 AntarchyGravityNetworking::handleGravityGunScroll
+        ).playToServer(
+                BigBerthaModeCyclePayload.TYPE,
+                BigBerthaModeCyclePayload.STREAM_CODEC,
+                AntarchyGravityNetworking::handleBigBerthaModeCycle
         ).playToServer(
                 com.craisinlord.antarchy.content.network.DiamondMinecartInputPayload.TYPE,
                 com.craisinlord.antarchy.content.network.DiamondMinecartInputPayload.STREAM_CODEC,
@@ -105,6 +111,20 @@ public final class AntarchyGravityNetworking {
         });
     }
 
+    private static void handleBigBerthaModeCycle(BigBerthaModeCyclePayload payload, IPayloadContext context) {
+        context.enqueueWork(() -> {
+            if (!(context.player() instanceof ServerPlayer serverPlayer)) {
+                return;
+            }
+
+            if (!(serverPlayer.getMainHandItem().getItem() instanceof BigBerthaItem bigBerthaItem)) {
+                return;
+            }
+
+            bigBerthaItem.tryCycleModeWhileCoolingDown(serverPlayer.serverLevel(), serverPlayer, serverPlayer.getMainHandItem());
+        });
+    }
+
     private static void handleGravityGunPrimary(GravityGunPrimaryPayload payload, IPayloadContext context) {
         context.enqueueWork(() -> {
             if (!(context.player() instanceof ServerPlayer serverPlayer)) {