Merge pull request #210 from Contrabass26/proning-1.18.2

Improved proning #206 (1.18.2)

src/main/java/com/github/manasmods/unordinary_basics/client/UBClient.java

@@ -106,7 +106,6 @@ public static void onTextureStitch(TextureStitchEvent.Pre event) {
 
     private static void registerKeybinds(){
         KeybindingRegistry.register(
-                UBKeybindings.SET_PRONE,
                 UBKeybindings.OPEN_UB_INV
         );
     }

src/main/java/com/github/manasmods/unordinary_basics/client/keybind/UBKeybindings.java

@@ -3,15 +3,13 @@
 import com.github.manasmods.manascore.api.client.keybinding.KeybindingCategory;
 import com.github.manasmods.manascore.api.client.keybinding.ManasKeybinding;
 import com.github.manasmods.unordinary_basics.network.Unordinary_BasicsNetwork;
-import com.github.manasmods.unordinary_basics.network.toserver.RequestPlayerProneToggle;
 import com.github.manasmods.unordinary_basics.network.toserver.RequestUBInventoryMenu;
 import com.mojang.blaze3d.platform.InputConstants;
 
 public class UBKeybindings {
 
     private static final KeybindingCategory UNORDINARY_BASICS = KeybindingCategory.of("unordinary_basics");
 
-    public static final ManasKeybinding SET_PRONE = new ManasKeybinding("unordinary_basics.keybinding.set_prone", InputConstants.KEY_X, UNORDINARY_BASICS, () -> Unordinary_BasicsNetwork.getInstance().sendToServer(new RequestPlayerProneToggle()));
     public static final ManasKeybinding OPEN_UB_INV = new ManasKeybinding("unordinary_basics.keybinding.open_ub_inv", InputConstants.KEY_I, UNORDINARY_BASICS, () -> Unordinary_BasicsNetwork.getInstance().sendToServer(new RequestUBInventoryMenu()));
 
 }

src/main/java/com/github/manasmods/unordinary_basics/handler/UBProneHandler.java

@@ -0,0 +1,26 @@
+package com.github.manasmods.unordinary_basics.handler;
+
+import com.github.manasmods.unordinary_basics.Unordinary_Basics;
+import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.player.Player;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID)
+public class UBProneHandler {
+
+    @SubscribeEvent
+    public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
+        Player player = event.player;
+        if (player.isCrouching()) {
+            if (!player.getLevel().getBlockState(player.getOnPos().above(2).relative(player.getDirection())).getCollisionShape(player.getLevel(), player.getOnPos().above(2).relative(player.getDirection())).isEmpty()
+                    && player.getPose() != Pose.SWIMMING
+                    && !player.getLevel().getBlockState(player.getOnPos().relative(player.getDirection())).getCollisionShape(player.getLevel(), player.getOnPos().relative(player.getDirection())).isEmpty() && player.getPose() != Pose.SWIMMING) {
+                player.setPos(player.getDirection().getStepX() / 2f + player.getX(), player.getY(), player.getDirection().getStepZ() / 2f + player.getZ());
+                player.setSwimming(true);
+                player.setPose(Pose.SWIMMING);
+            }
+        }
+    }
+}

src/main/java/com/github/manasmods/unordinary_basics/network/Unordinary_BasicsNetwork.java

@@ -17,7 +17,6 @@ public static void registerPackets() {
         INSTANCE.registerMessage(++messageId, RequestJukeboxUpdate.class, RequestJukeboxUpdate::toBytes, RequestJukeboxUpdate::new, RequestJukeboxUpdate::handle);
         INSTANCE.registerMessage(++messageId, RequestMenuChange.class, RequestMenuChange::toBytes, RequestMenuChange::new, RequestMenuChange::handle);
         INSTANCE.registerMessage(++messageId, RequestUBInventoryMenu.class, RequestUBInventoryMenu::toBytes, RequestUBInventoryMenu::new, RequestUBInventoryMenu::handle);
-        INSTANCE.registerMessage(++messageId, RequestPlayerProneToggle.class, RequestPlayerProneToggle::toBytes, RequestPlayerProneToggle::new, RequestPlayerProneToggle::handle);
         INSTANCE.registerMessage(++messageId, UBInventoryClientSync.class, UBInventoryClientSync::toBytes, UBInventoryClientSync::new, UBInventoryClientSync::handle);
         INSTANCE.registerMessage(++messageId, SetItemSorterMessage.class, SetItemSorterMessage::toBytes, SetItemSorterMessage::new, SetItemSorterMessage::handle);
     }