diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 692737d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "Website"] - path = Website - url = ssh://git@tudbut.de:222/BaseBand/Website.git - branch = main diff --git a/Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java b/Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java index 8aacb9b..67a50b4 100644 --- a/Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java +++ b/Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java @@ -9,10 +9,12 @@ import de.com.baseband.client.registry.annotation.Description; import de.com.baseband.client.registry.annotation.Gate; import de.com.baseband.client.registry.annotation.Range; import de.com.baseband.client.util.adapt.Marker; +import de.com.baseband.client.util.interact.InventoryUtils; import de.com.baseband.client.util.interact.MotionUtil; import de.tudbut.tools.Lock; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ClickType; import net.minecraft.network.Packet; import net.minecraft.network.play.client.CPacketEntityAction; import net.minecraft.network.play.client.CPacketPlayer; @@ -28,6 +30,15 @@ public class ElytraFly extends Feature { Packet, } + @Config("Stop flying on disable") + @Description("Stops your elytra when you disable the module.") + @Marker(4) + public boolean stopOnDisable = false; + + @Config("Stop with packet") + @Gate(4) + public boolean stopWithPacket = true; + @Config("Mixin (recommended)") @Description("Use the client's mixin for ElytraFly control, which is more accurate but can theoretically be broken by other clients.") @Marker(2) @@ -110,6 +121,16 @@ public class ElytraFly extends Feature { @Override public void onDisable() { init = false; + if(stopOnDisable) { + if(stopWithPacket) { + mc.player.connection.sendPacket(new CPacketPlayer.Position(mc.player.posX, mc.player.posY, mc.player.posZ, true)); + mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_FALL_FLYING)); + } + else { + InventoryUtils.clickSlot(6, ClickType.PICKUP, 0); + InventoryUtils.clickSlot(6, ClickType.PICKUP, 0); + } + } } @Override diff --git a/Website b/Website deleted file mode 160000 index a9a51ce..0000000 --- a/Website +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9a51cea763298f0225594416c832252a821830f