From a79041aae0bad4e02445dcc64ed813dc8ae26149 Mon Sep 17 00:00:00 2001 From: cz Date: Wed, 5 Jan 2022 23:26:45 -0600 Subject: [PATCH 1/6] Add all packets to PacketCancel --- .../module/modules/player/PacketCancel.kt | 267 ++++++++++++++++-- 1 file changed, 245 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt index ab24950bf..af249a5f7 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt @@ -4,42 +4,265 @@ import com.lambda.client.event.events.PacketEvent import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.event.listener.listener +import net.minecraft.network.login.client.* +import net.minecraft.network.login.server.* import net.minecraft.network.play.client.* +import net.minecraft.network.play.server.* +import net.minecraft.network.play.server.SPacketDisconnect +import net.minecraft.network.status.client.* +import net.minecraft.network.status.server.* object PacketCancel : Module( name = "PacketCancel", description = "Cancels specific packets used for various actions", category = Category.PLAYER ) { - private val all by setting("All", false) - private val packetInput by setting("CPacket Input", true, { !all }) - private val packetPlayer by setting("CPacket Player", true, { !all }) - private val packetEntityAction by setting("CPacket Entity Action", true, { !all }) - private val packetUseEntity by setting("CPacket Use Entity", true, { !all }) - private val packetVehicleMove by setting("CPacket Vehicle Move", true, { !all }) + enum class PageEnum { + Client, Server + } - private var numPackets = 0 + val page by setting("Page", PageEnum.Client) - override fun getHudInfo(): String { - return numPackets.toString() - } + private val CPacketAnimationSetting by setting("CPacketAnimation", false, { page == PageEnum.Client}) + private val CPacketUseEntitySetting by setting("CPacketUseEntity", false, { page == PageEnum.Client}) + private val CPacketChatMessageSetting by setting("CPacketChatMessage", false, { page == PageEnum.Client}) + private val CPacketClickWindowSetting by setting("CPacketClickWindow", false, { page == PageEnum.Client}) + private val CPacketClientSettingsSetting by setting("CPacketClient", false, { page == PageEnum.Client}) + private val CPacketClientStatusSetting by setting("CPacketClientStatus", false, { page == PageEnum.Client}) + private val CPacketCloseWindowSetting by setting("CPacketCloseWindow", false, { page == PageEnum.Client}) + private val CPacketConfirmTeleportSetting by setting("CPacketConfirmTeleport", false, { page == PageEnum.Client}) + private val CPacketConfirmTransactionSetting by setting("CPacketConfirmTransaction", false, { page == PageEnum.Client}) + private val CPacketCreativeInventoryActionSetting by setting("CPacketCreativeInventoryAction", false, { page == PageEnum.Client}) + private val CPacketCustomPayloadSetting by setting("CPacketCustomPayload", false, { page == PageEnum.Client}) + private val CPacketEnchantItemSetting by setting("CPacketEnchantItem", false, { page == PageEnum.Client}) + private val CPacketEntityActionSetting by setting("CPacketEntityAction", false, { page == PageEnum.Client}) + private val CPacketPlayerSetting by setting("CPacketPlayer", false, { page == PageEnum.Client}) + private val CPacketHeldItemChangeSetting by setting("CPacketHeldItemChange", false, { page == PageEnum.Client}) + private val CPacketInputSetting by setting("CPacketInput", false, { page == PageEnum.Client}) + private val CPacketPlaceRecipeSetting by setting("CPacketPlaceRecipe", false, { page == PageEnum.Client}) + private val CPacketPlayerAbilitiesSetting by setting("CPacketPlayerAbilities", false, { page == PageEnum.Client}) + private val CPacketPlayerTryUseItemSetting by setting("CPacketPlayerTryUseItem", false, { page == PageEnum.Client}) + private val CPacketPlayerTryUseItemOnBlockSetting by setting("CPacketPlayerTryUseItemOnBlock", false, { page == PageEnum.Client}) + private val CPacketServerQuerySetting by setting("CPacketServerQuery", false, { page == PageEnum.Client}) + private val CPacketLoginStartSetting by setting("CPacketLoginStart", false, { page == PageEnum.Client}) + private val CPacketPingSetting by setting("CPacketPing", false, { page == PageEnum.Client}) + private val CPacketEncryptionResponseSetting by setting("CPacketEncryptionResponse", false, { page == PageEnum.Client}) + private val CPacketVehicleMoveSetting by setting("CPacketVehicleMove", false, { page == PageEnum.Client}) + private val CPacketUpdateSignSetting by setting("CPacketUpdateSign", false, { page == PageEnum.Client}) + private val CPacketTabCompleteSetting by setting("CPacketTabComplete", false, { page == PageEnum.Client}) + private val CPacketSteerBoatSetting by setting("CPacketSteerBoat", false, { page == PageEnum.Client}) + private val CPacketSpectateSetting by setting("CPacketSpectate", false, { page == PageEnum.Client}) + private val CPacketSeenAdvancementsSetting by setting("CPacketSeenAdvancements", false, { page == PageEnum.Client}) + private val CPacketResourcePackStatusSetting by setting("CPacketResourcePackStatus", false, { page == PageEnum.Client}) + private val CPacketRecipeInfoSetting by setting("CPacketRecipeInfo", false, { page == PageEnum.Client}) + private val CPacketPlayerDiggingSetting by setting("CPacketPlayerDigging", false, { page == PageEnum.Client}) + private val CPacketKeepAliveSetting by setting("CPacketKeepAlive", false, { page == PageEnum.Client}) + + private val SPacketEntityS17PacketEntityLookMoveSetting by setting("SPacketEntity.S17PacketEntityLookMove", false, { page == PageEnum.Server}) + private val SPacketEntityS16PacketEntityLookSetting by setting("SPacketEntity.S16PacketEntityLook", false, { page == PageEnum.Server}) + private val SPacketEntityS15PacketEntityRelMoveSetting by setting("SPacketEntity.S15PacketEntityRelMove", false, { page == PageEnum.Server}) + private val SPacketServerInfoSetting by setting("SPacketServerInfo", false, { page == PageEnum.Server}) + private val SPacketLoginSuccessSetting by setting("SPacketLoginSuccess", false, { page == PageEnum.Server}) + private val SPacketWorldBorderSetting by setting("SPacketWorldBorder", false, { page == PageEnum.Server}) + private val SPacketWindowPropertySetting by setting("SPacketWindowProperty", false, { page == PageEnum.Server}) + private val SPacketWindowItemsSetting by setting("SPacketWindowItems", false, { page == PageEnum.Server}) + private val SPacketPongSetting by setting("SPacketPong", false, { page == PageEnum.Server}) + private val SPacketEncryptionRequestSetting by setting("SPacketEncryptionRequest", false, { page == PageEnum.Server}) + private val SPacketEnableCompressionSetting by setting("SPacketEnableCompression", false, { page == PageEnum.Server}) + private val SPacketDisconnectSetting by setting("SPacketDisconnect", false, { page == PageEnum.Server}) + private val SPacketUseBedSetting by setting("SPacketUseBed", false, { page == PageEnum.Server}) + private val SPacketUpdateTileEntitySetting by setting("SPacketUpdateTileEntity", false, { page == PageEnum.Server}) + private val SPacketUpdateScoreSetting by setting("SPacketUpdateScore", false, { page == PageEnum.Server}) + private val SPacketUpdateHealthSetting by setting("SPacketUpdateHealth", false, { page == PageEnum.Server}) + private val SPacketUpdateBossInfoSetting by setting("SPacketUpdateBossInfo", false, { page == PageEnum.Server}) + private val SPacketUnloadChunkSetting by setting("SPacketUnloadChunk", false, { page == PageEnum.Server}) + private val SPacketTitleSetting by setting("SPacketTitle", false, { page == PageEnum.Server}) + private val SPacketTimeUpdateSetting by setting("SPacketTimeUpdate", false, { page == PageEnum.Server}) + private val SPacketTeamsSetting by setting("SPacketTeams", false, { page == PageEnum.Server}) + private val SPacketTabCompleteSetting by setting("SPacketTabComplete", false, { page == PageEnum.Server}) + private val SPacketStatisticsSetting by setting("SPacketStatistics", false, { page == PageEnum.Server}) + private val SPacketSpawnPositionSetting by setting("SPacketSpawnPosition", false, { page == PageEnum.Server}) + private val SPacketSpawnPaintingSetting by setting("SPacketSpawnPainting", false, { page == PageEnum.Server}) + private val SPacketSpawnObjectSetting by setting("SPacketSpawnObject", false, { page == PageEnum.Server}) + private val SPacketSpawnPlayerSetting by setting("SPacketSpawnPlayer", false, { page == PageEnum.Server}) + private val SPacketSpawnMobSetting by setting("SPacketSpawnMob", false, { page == PageEnum.Server}) + private val SPacketSpawnGlobalEntitySetting by setting("SPacketSpawnGlobalEntity", false, { page == PageEnum.Server}) + private val SPacketSpawnExperienceOrbSetting by setting("SPacketSpawnExperienceOrb", false, { page == PageEnum.Server}) + private val SPacketSoundEffectSetting by setting("SPacketSoundEffect", false, { page == PageEnum.Server}) + private val SPacketSignEditorOpenSetting by setting("SPacketSignEditorOpen", false, { page == PageEnum.Server}) + private val SPacketSetSlotSetting by setting("SPacketSetSlot", false, { page == PageEnum.Server}) + private val SPacketSetExperienceSetting by setting("SPacketSetExperience", false, { page == PageEnum.Server}) + private val SPacketServerDifficultySetting by setting("SPacketServerDifficulty", false, { page == PageEnum.Server}) + private val SPacketSelectAdvancementsTabSetting by setting("SPacketSelectAdvancementsTab", false, { page == PageEnum.Server}) + private val SPacketScoreboardObjectiveSetting by setting("SPacketScoreboardObjective", false, { page == PageEnum.Server}) + private val SPacketRespawnSetting by setting("SPacketRespawn", false, { page == PageEnum.Server}) + private val SPacketResourcePackSendSetting by setting("SPacketResourcePackSend", false, { page == PageEnum.Server}) + private val SPacketRemoveEntityEffectSetting by setting("SPacketRemoveEntityEffect", false, { page == PageEnum.Server}) + private val SPacketRecipeBookSetting by setting("SPacketRecipeBook", false, { page == PageEnum.Server}) + private val SPacketPlayerListItemSetting by setting("SPacketPlayerListItem", false, { page == PageEnum.Server}) + private val SPacketPlayerListHeaderFooterSetting by setting("SPacketPlayerListHeaderFooter", false, { page == PageEnum.Server}) + private val SPacketPlayerAbilitiesSetting by setting("SPacketPlayerAbilities", false, { page == PageEnum.Server}) + private val SPacketPlaceGhostRecipeSetting by setting("SPacketPlaceGhostRecipe", false, { page == PageEnum.Server}) + private val SPacketParticlesSetting by setting("SPacketParticles", false, { page == PageEnum.Server}) + private val SPacketOpenWindowSetting by setting("SPacketOpenWindow", false, { page == PageEnum.Server}) + private val SPacketMultiBlockChangeSetting by setting("SPacketMultiBlockChange", false, { page == PageEnum.Server}) + private val SPacketMapsSetting by setting("SPacketMaps", false, { page == PageEnum.Server}) + private val SPacketKeepAliveSetting by setting("SPacketKeepAlive", false, { page == PageEnum.Server}) + private val SPacketJoinGameSetting by setting("SPacketJoinGame", false, { page == PageEnum.Server}) + private val SPacketHeldItemChangeSetting by setting("SPacketHeldItemChange", false, { page == PageEnum.Server}) + private val SPacketExplosionSetting by setting("SPacketExplosion", false, { page == PageEnum.Server}) + private val SPacketEntityVelocitySetting by setting("SPacketEntityVelocity", false, { page == PageEnum.Server}) + private val SPacketEntityTeleportSetting by setting("SPacketEntityTeleport", false, { page == PageEnum.Server}) + private val SPacketEntityStatusSetting by setting("SPacketEntityStatus", false, { page == PageEnum.Server}) + private val SPacketEntityPropertiesSetting by setting("SPacketEntityProperties", false, { page == PageEnum.Server}) + private val SPacketEntityMetadataSetting by setting("SPacketEntityMetadata", false, { page == PageEnum.Server}) + private val SPacketEntityHeadLookSetting by setting("SPacketEntityHeadLook", false, { page == PageEnum.Server}) + private val SPacketEntityEquipmentSetting by setting("SPacketEntityEquipment", false, { page == PageEnum.Server}) + private val SPacketEntityEffectSetting by setting("SPacketEntityEffect", false, { page == PageEnum.Server}) + private val SPacketEntityAttachSetting by setting("SPacketEntityAttach", false, { page == PageEnum.Server}) + private val SPacketEffectSetting by setting("SPacketEffect", false, { page == PageEnum.Server}) + private val SPacketDisplayObjectiveSetting by setting("SPacketDisplayObjective", false, { page == PageEnum.Server}) + private val SPacketDestroyEntitiesSetting by setting("SPacketDestroyEntities", false, { page == PageEnum.Server}) + private val SPacketCustomSoundSetting by setting("SPacketCustomSound", false, { page == PageEnum.Server}) + private val SPacketCustomPayloadSetting by setting("SPacketCustomPayload", false, { page == PageEnum.Server}) + private val SPacketCooldownSetting by setting("SPacketCooldown", false, { page == PageEnum.Server}) + private val SPacketConfirmTransactionSetting by setting("SPacketConfirmTransaction", false, { page == PageEnum.Server}) + private val SPacketCombatEventSetting by setting("SPacketCombatEvent", false, { page == PageEnum.Server}) + private val SPacketCollectItemSetting by setting("SPacketCollectItem", false, { page == PageEnum.Server}) + private val SPacketCloseWindowSetting by setting("SPacketCloseWindow", false, { page == PageEnum.Server}) + private val SPacketChunkDataSetting by setting("SPacketChunkData", false, { page == PageEnum.Server}) + private val SPacketChatSetting by setting("SPacketChat", false, { page == PageEnum.Server}) + private val SPacketChangeGameStateSetting by setting("SPacketChangeGameState", false, { page == PageEnum.Server}) + private val SPacketCameraSetting by setting("SPacketCamera", false, { page == PageEnum.Server}) + private val SPacketBlockChangeSetting by setting("SPacketBlockChange", false, { page == PageEnum.Server}) + private val SPacketBlockBreakAnimSetting by setting("SPacketBlockBreakAnim", false, { page == PageEnum.Server}) + private val SPacketBlockActionSetting by setting("SPacketBlockAction", false, { page == PageEnum.Server}) + private val SPacketAnimationSetting by setting("SPacketAnimation", false, { page == PageEnum.Server}) + private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { page == PageEnum.Server}) init { listener { - if (all - || it.packet is CPacketInput && packetInput - || it.packet is CPacketPlayer && packetPlayer - || it.packet is CPacketEntityAction && packetEntityAction - || it.packet is CPacketUseEntity && packetUseEntity - || it.packet is CPacketVehicleMove && packetVehicleMove - ) { - it.cancel() - numPackets++ + when(it.packet) { + is CPacketAnimation -> if (CPacketAnimationSetting) it.cancel() + is CPacketUseEntity -> if (CPacketUseEntitySetting) it.cancel() + is CPacketChatMessage -> if (CPacketChatMessageSetting) it.cancel() + is CPacketClickWindow -> if (CPacketClickWindowSetting) it.cancel() + is CPacketClientSettings -> if (CPacketClientSettingsSetting) it.cancel() + is CPacketClientStatus -> if (CPacketClientStatusSetting) it.cancel() + is CPacketCloseWindow -> if (CPacketCloseWindowSetting) it.cancel() + is CPacketConfirmTeleport -> if (CPacketConfirmTeleportSetting) it.cancel() + is CPacketConfirmTransaction -> if (CPacketConfirmTransactionSetting) it.cancel() + is CPacketCreativeInventoryAction -> if (CPacketCreativeInventoryActionSetting) it.cancel() + is CPacketCustomPayload -> if (CPacketCustomPayloadSetting) it.cancel() + is CPacketEnchantItem -> if (CPacketEnchantItemSetting) it.cancel() + is CPacketEntityAction -> if (CPacketEntityActionSetting) it.cancel() + is CPacketPlayer -> if (CPacketPlayerSetting) it.cancel() + is CPacketHeldItemChange -> if (CPacketHeldItemChangeSetting) it.cancel() + is CPacketInput -> if (CPacketInputSetting) it.cancel() + is CPacketPlaceRecipe -> if (CPacketPlaceRecipeSetting) it.cancel() + is CPacketPlayerAbilities -> if (CPacketPlayerAbilitiesSetting) it.cancel() + is CPacketPlayerTryUseItem -> if (CPacketPlayerTryUseItemSetting) it.cancel() + is CPacketPlayerTryUseItemOnBlock -> if (CPacketPlayerTryUseItemOnBlockSetting) it.cancel() + is CPacketServerQuery -> if (CPacketServerQuerySetting) it.cancel() + is CPacketLoginStart -> if (CPacketLoginStartSetting) it.cancel() + is CPacketPing -> if (CPacketPingSetting) it.cancel() + is CPacketEncryptionResponse -> if (CPacketEncryptionResponseSetting) it.cancel() + is CPacketVehicleMove -> if (CPacketVehicleMoveSetting) it.cancel() + is CPacketUpdateSign -> if (CPacketUpdateSignSetting) it.cancel() + is CPacketTabComplete -> if (CPacketTabCompleteSetting) it.cancel() + is CPacketSteerBoat -> if (CPacketSteerBoatSetting) it.cancel() + is CPacketSpectate -> if (CPacketSpectateSetting) it.cancel() + is CPacketSeenAdvancements -> if (CPacketSeenAdvancementsSetting) it.cancel() + is CPacketResourcePackStatus -> if (CPacketResourcePackStatusSetting) it.cancel() + is CPacketRecipeInfo -> if (CPacketRecipeInfoSetting) it.cancel() + is CPacketPlayerDigging -> if (CPacketPlayerDiggingSetting) it.cancel() + is CPacketKeepAlive -> if (CPacketKeepAliveSetting) it.cancel() } } - - onDisable { - numPackets = 0 + listener { + when (it.packet) { + is SPacketEntity.S17PacketEntityLookMove -> if(SPacketEntityS17PacketEntityLookMoveSetting) it.cancel() + is SPacketEntity.S16PacketEntityLook -> if(SPacketEntityS16PacketEntityLookSetting) it.cancel() + is SPacketEntity.S15PacketEntityRelMove -> if(SPacketEntityS15PacketEntityRelMoveSetting) it.cancel() + is SPacketServerInfo -> if(SPacketServerInfoSetting) it.cancel() + is SPacketLoginSuccess -> if(SPacketLoginSuccessSetting) it.cancel() + is SPacketWorldBorder -> if(SPacketWorldBorderSetting) it.cancel() + is SPacketWindowProperty -> if(SPacketWindowPropertySetting) it.cancel() + is SPacketWindowItems -> if(SPacketWindowItemsSetting) it.cancel() + is SPacketPong -> if(SPacketPongSetting) it.cancel() + is SPacketEncryptionRequest -> if(SPacketEncryptionRequestSetting) it.cancel() + is SPacketEnableCompression -> if(SPacketEnableCompressionSetting) it.cancel() + is SPacketDisconnect -> if(SPacketDisconnectSetting) it.cancel() + is SPacketUseBed -> if(SPacketUseBedSetting) it.cancel() + is SPacketUpdateTileEntity -> if(SPacketUpdateTileEntitySetting) it.cancel() + is SPacketUpdateScore -> if(SPacketUpdateScoreSetting) it.cancel() + is SPacketUpdateHealth -> if(SPacketUpdateHealthSetting) it.cancel() + is SPacketUpdateBossInfo -> if(SPacketUpdateBossInfoSetting) it.cancel() + is SPacketUnloadChunk -> if(SPacketUnloadChunkSetting) it.cancel() + is SPacketTitle -> if(SPacketTitleSetting) it.cancel() + is SPacketTimeUpdate -> if(SPacketTimeUpdateSetting) it.cancel() + is SPacketTeams -> if(SPacketTeamsSetting) it.cancel() + is SPacketTabComplete -> if(SPacketTabCompleteSetting) it.cancel() + is SPacketStatistics -> if(SPacketStatisticsSetting) it.cancel() + is SPacketSpawnPosition -> if(SPacketSpawnPositionSetting) it.cancel() + is SPacketSpawnPainting -> if(SPacketSpawnPaintingSetting) it.cancel() + is SPacketSpawnObject -> if(SPacketSpawnObjectSetting) it.cancel() + is SPacketSpawnPlayer -> if(SPacketSpawnPlayerSetting) it.cancel() + is SPacketSpawnMob -> if(SPacketSpawnMobSetting) it.cancel() + is SPacketSpawnGlobalEntity -> if(SPacketSpawnGlobalEntitySetting) it.cancel() + is SPacketSpawnExperienceOrb -> if(SPacketSpawnExperienceOrbSetting) it.cancel() + is SPacketSoundEffect -> if(SPacketSoundEffectSetting) it.cancel() + is SPacketSignEditorOpen -> if(SPacketSignEditorOpenSetting) it.cancel() + is SPacketSetSlot -> if(SPacketSetSlotSetting) it.cancel() + is SPacketSetExperience -> if(SPacketSetExperienceSetting) it.cancel() + is SPacketServerDifficulty -> if(SPacketServerDifficultySetting) it.cancel() + is SPacketSelectAdvancementsTab -> if(SPacketSelectAdvancementsTabSetting) it.cancel() + is SPacketScoreboardObjective -> if(SPacketScoreboardObjectiveSetting) it.cancel() + is SPacketRespawn -> if(SPacketRespawnSetting) it.cancel() + is SPacketResourcePackSend -> if(SPacketResourcePackSendSetting) it.cancel() + is SPacketRemoveEntityEffect -> if(SPacketRemoveEntityEffectSetting) it.cancel() + is SPacketRecipeBook -> if(SPacketRecipeBookSetting) it.cancel() + is SPacketPlayerListItem -> if(SPacketPlayerListItemSetting) it.cancel() + is SPacketPlayerListHeaderFooter -> if(SPacketPlayerListHeaderFooterSetting) it.cancel() + is SPacketPlayerAbilities -> if(SPacketPlayerAbilitiesSetting) it.cancel() + is SPacketPlaceGhostRecipe -> if(SPacketPlaceGhostRecipeSetting) it.cancel() + is SPacketParticles -> if(SPacketParticlesSetting) it.cancel() + is SPacketOpenWindow -> if(SPacketOpenWindowSetting) it.cancel() + is SPacketMultiBlockChange -> if(SPacketMultiBlockChangeSetting) it.cancel() + is SPacketMaps -> if(SPacketMapsSetting) it.cancel() + is SPacketKeepAlive -> if(SPacketKeepAliveSetting) it.cancel() + is SPacketJoinGame -> if(SPacketJoinGameSetting) it.cancel() + is SPacketHeldItemChange -> if(SPacketHeldItemChangeSetting) it.cancel() + is SPacketExplosion -> if(SPacketExplosionSetting) it.cancel() + is SPacketEntityVelocity -> if(SPacketEntityVelocitySetting) it.cancel() + is SPacketEntityTeleport -> if(SPacketEntityTeleportSetting) it.cancel() + is SPacketEntityStatus -> if(SPacketEntityStatusSetting) it.cancel() + is SPacketEntityProperties -> if(SPacketEntityPropertiesSetting) it.cancel() + is SPacketEntityMetadata -> if(SPacketEntityMetadataSetting) it.cancel() + is SPacketEntityHeadLook -> if(SPacketEntityHeadLookSetting) it.cancel() + is SPacketEntityEquipment -> if(SPacketEntityEquipmentSetting) it.cancel() + is SPacketEntityEffect -> if(SPacketEntityEffectSetting) it.cancel() + is SPacketEntityAttach -> if(SPacketEntityAttachSetting) it.cancel() + is SPacketEffect -> if(SPacketEffectSetting) it.cancel() + is SPacketDisplayObjective -> if(SPacketDisplayObjectiveSetting) it.cancel() + is SPacketDestroyEntities -> if(SPacketDestroyEntitiesSetting) it.cancel() + is SPacketCustomSound -> if(SPacketCustomSoundSetting) it.cancel() + is SPacketCustomPayload -> if(SPacketCustomPayloadSetting) it.cancel() + is SPacketCooldown -> if(SPacketCooldownSetting) it.cancel() + is SPacketConfirmTransaction -> if(SPacketConfirmTransactionSetting) it.cancel() + is SPacketCombatEvent -> if(SPacketCombatEventSetting) it.cancel() + is SPacketCollectItem -> if(SPacketCollectItemSetting) it.cancel() + is SPacketCloseWindow -> if(SPacketCloseWindowSetting) it.cancel() + is SPacketChunkData -> if(SPacketChunkDataSetting) it.cancel() + is SPacketChat -> if(SPacketChatSetting) it.cancel() + is SPacketChangeGameState -> if(SPacketChangeGameStateSetting) it.cancel() + is SPacketCamera -> if(SPacketCameraSetting) it.cancel() + is SPacketBlockChange -> if(SPacketBlockChangeSetting) it.cancel() + is SPacketBlockBreakAnim -> if(SPacketBlockBreakAnimSetting) it.cancel() + is SPacketBlockAction -> if(SPacketBlockActionSetting) it.cancel() + is SPacketAnimation -> if(SPacketAnimationSetting) it.cancel() + is SPacketAdvancementInfo -> if(SPacketAdvancementInfoSetting) it.cancel() + } } } } \ No newline at end of file From dd34c0f57baad58f8191708a0d8f4d8d7a6b2bcf Mon Sep 17 00:00:00 2001 From: Constructor Date: Thu, 6 Jan 2022 07:03:12 +0100 Subject: [PATCH 2/6] Categories for packets --- .../module/modules/player/PacketCancel.kt | 422 +++++++++--------- 1 file changed, 216 insertions(+), 206 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt index af249a5f7..5eb3e01e9 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt @@ -4,147 +4,157 @@ import com.lambda.client.event.events.PacketEvent import com.lambda.client.module.Category import com.lambda.client.module.Module import com.lambda.event.listener.listener -import net.minecraft.network.login.client.* -import net.minecraft.network.login.server.* +import net.minecraft.network.login.client.CPacketEncryptionResponse +import net.minecraft.network.login.client.CPacketLoginStart +import net.minecraft.network.login.server.SPacketEnableCompression +import net.minecraft.network.login.server.SPacketEncryptionRequest +import net.minecraft.network.login.server.SPacketLoginSuccess import net.minecraft.network.play.client.* import net.minecraft.network.play.server.* -import net.minecraft.network.play.server.SPacketDisconnect -import net.minecraft.network.status.client.* -import net.minecraft.network.status.server.* +import net.minecraft.network.status.client.CPacketPing +import net.minecraft.network.status.client.CPacketServerQuery +import net.minecraft.network.status.server.SPacketPong +import net.minecraft.network.status.server.SPacketServerInfo object PacketCancel : Module( name = "PacketCancel", description = "Cancels specific packets used for various actions", category = Category.PLAYER ) { - enum class PageEnum { - Client, Server + enum class Page { + CLIENT, SERVER } - val page by setting("Page", PageEnum.Client) + enum class CategoryEnum { + PLAYER, INVENTORY, CLIENT + } + + private val page by setting("Page", Page.CLIENT) - private val CPacketAnimationSetting by setting("CPacketAnimation", false, { page == PageEnum.Client}) - private val CPacketUseEntitySetting by setting("CPacketUseEntity", false, { page == PageEnum.Client}) - private val CPacketChatMessageSetting by setting("CPacketChatMessage", false, { page == PageEnum.Client}) - private val CPacketClickWindowSetting by setting("CPacketClickWindow", false, { page == PageEnum.Client}) - private val CPacketClientSettingsSetting by setting("CPacketClient", false, { page == PageEnum.Client}) - private val CPacketClientStatusSetting by setting("CPacketClientStatus", false, { page == PageEnum.Client}) - private val CPacketCloseWindowSetting by setting("CPacketCloseWindow", false, { page == PageEnum.Client}) - private val CPacketConfirmTeleportSetting by setting("CPacketConfirmTeleport", false, { page == PageEnum.Client}) - private val CPacketConfirmTransactionSetting by setting("CPacketConfirmTransaction", false, { page == PageEnum.Client}) - private val CPacketCreativeInventoryActionSetting by setting("CPacketCreativeInventoryAction", false, { page == PageEnum.Client}) - private val CPacketCustomPayloadSetting by setting("CPacketCustomPayload", false, { page == PageEnum.Client}) - private val CPacketEnchantItemSetting by setting("CPacketEnchantItem", false, { page == PageEnum.Client}) - private val CPacketEntityActionSetting by setting("CPacketEntityAction", false, { page == PageEnum.Client}) - private val CPacketPlayerSetting by setting("CPacketPlayer", false, { page == PageEnum.Client}) - private val CPacketHeldItemChangeSetting by setting("CPacketHeldItemChange", false, { page == PageEnum.Client}) - private val CPacketInputSetting by setting("CPacketInput", false, { page == PageEnum.Client}) - private val CPacketPlaceRecipeSetting by setting("CPacketPlaceRecipe", false, { page == PageEnum.Client}) - private val CPacketPlayerAbilitiesSetting by setting("CPacketPlayerAbilities", false, { page == PageEnum.Client}) - private val CPacketPlayerTryUseItemSetting by setting("CPacketPlayerTryUseItem", false, { page == PageEnum.Client}) - private val CPacketPlayerTryUseItemOnBlockSetting by setting("CPacketPlayerTryUseItemOnBlock", false, { page == PageEnum.Client}) - private val CPacketServerQuerySetting by setting("CPacketServerQuery", false, { page == PageEnum.Client}) - private val CPacketLoginStartSetting by setting("CPacketLoginStart", false, { page == PageEnum.Client}) - private val CPacketPingSetting by setting("CPacketPing", false, { page == PageEnum.Client}) - private val CPacketEncryptionResponseSetting by setting("CPacketEncryptionResponse", false, { page == PageEnum.Client}) - private val CPacketVehicleMoveSetting by setting("CPacketVehicleMove", false, { page == PageEnum.Client}) - private val CPacketUpdateSignSetting by setting("CPacketUpdateSign", false, { page == PageEnum.Client}) - private val CPacketTabCompleteSetting by setting("CPacketTabComplete", false, { page == PageEnum.Client}) - private val CPacketSteerBoatSetting by setting("CPacketSteerBoat", false, { page == PageEnum.Client}) - private val CPacketSpectateSetting by setting("CPacketSpectate", false, { page == PageEnum.Client}) - private val CPacketSeenAdvancementsSetting by setting("CPacketSeenAdvancements", false, { page == PageEnum.Client}) - private val CPacketResourcePackStatusSetting by setting("CPacketResourcePackStatus", false, { page == PageEnum.Client}) - private val CPacketRecipeInfoSetting by setting("CPacketRecipeInfo", false, { page == PageEnum.Client}) - private val CPacketPlayerDiggingSetting by setting("CPacketPlayerDigging", false, { page == PageEnum.Client}) - private val CPacketKeepAliveSetting by setting("CPacketKeepAlive", false, { page == PageEnum.Client}) + private val categorySetting by setting("Category", CategoryEnum.PLAYER) - private val SPacketEntityS17PacketEntityLookMoveSetting by setting("SPacketEntity.S17PacketEntityLookMove", false, { page == PageEnum.Server}) - private val SPacketEntityS16PacketEntityLookSetting by setting("SPacketEntity.S16PacketEntityLook", false, { page == PageEnum.Server}) - private val SPacketEntityS15PacketEntityRelMoveSetting by setting("SPacketEntity.S15PacketEntityRelMove", false, { page == PageEnum.Server}) - private val SPacketServerInfoSetting by setting("SPacketServerInfo", false, { page == PageEnum.Server}) - private val SPacketLoginSuccessSetting by setting("SPacketLoginSuccess", false, { page == PageEnum.Server}) - private val SPacketWorldBorderSetting by setting("SPacketWorldBorder", false, { page == PageEnum.Server}) - private val SPacketWindowPropertySetting by setting("SPacketWindowProperty", false, { page == PageEnum.Server}) - private val SPacketWindowItemsSetting by setting("SPacketWindowItems", false, { page == PageEnum.Server}) - private val SPacketPongSetting by setting("SPacketPong", false, { page == PageEnum.Server}) - private val SPacketEncryptionRequestSetting by setting("SPacketEncryptionRequest", false, { page == PageEnum.Server}) - private val SPacketEnableCompressionSetting by setting("SPacketEnableCompression", false, { page == PageEnum.Server}) - private val SPacketDisconnectSetting by setting("SPacketDisconnect", false, { page == PageEnum.Server}) - private val SPacketUseBedSetting by setting("SPacketUseBed", false, { page == PageEnum.Server}) - private val SPacketUpdateTileEntitySetting by setting("SPacketUpdateTileEntity", false, { page == PageEnum.Server}) - private val SPacketUpdateScoreSetting by setting("SPacketUpdateScore", false, { page == PageEnum.Server}) - private val SPacketUpdateHealthSetting by setting("SPacketUpdateHealth", false, { page == PageEnum.Server}) - private val SPacketUpdateBossInfoSetting by setting("SPacketUpdateBossInfo", false, { page == PageEnum.Server}) - private val SPacketUnloadChunkSetting by setting("SPacketUnloadChunk", false, { page == PageEnum.Server}) - private val SPacketTitleSetting by setting("SPacketTitle", false, { page == PageEnum.Server}) - private val SPacketTimeUpdateSetting by setting("SPacketTimeUpdate", false, { page == PageEnum.Server}) - private val SPacketTeamsSetting by setting("SPacketTeams", false, { page == PageEnum.Server}) - private val SPacketTabCompleteSetting by setting("SPacketTabComplete", false, { page == PageEnum.Server}) - private val SPacketStatisticsSetting by setting("SPacketStatistics", false, { page == PageEnum.Server}) - private val SPacketSpawnPositionSetting by setting("SPacketSpawnPosition", false, { page == PageEnum.Server}) - private val SPacketSpawnPaintingSetting by setting("SPacketSpawnPainting", false, { page == PageEnum.Server}) - private val SPacketSpawnObjectSetting by setting("SPacketSpawnObject", false, { page == PageEnum.Server}) - private val SPacketSpawnPlayerSetting by setting("SPacketSpawnPlayer", false, { page == PageEnum.Server}) - private val SPacketSpawnMobSetting by setting("SPacketSpawnMob", false, { page == PageEnum.Server}) - private val SPacketSpawnGlobalEntitySetting by setting("SPacketSpawnGlobalEntity", false, { page == PageEnum.Server}) - private val SPacketSpawnExperienceOrbSetting by setting("SPacketSpawnExperienceOrb", false, { page == PageEnum.Server}) - private val SPacketSoundEffectSetting by setting("SPacketSoundEffect", false, { page == PageEnum.Server}) - private val SPacketSignEditorOpenSetting by setting("SPacketSignEditorOpen", false, { page == PageEnum.Server}) - private val SPacketSetSlotSetting by setting("SPacketSetSlot", false, { page == PageEnum.Server}) - private val SPacketSetExperienceSetting by setting("SPacketSetExperience", false, { page == PageEnum.Server}) - private val SPacketServerDifficultySetting by setting("SPacketServerDifficulty", false, { page == PageEnum.Server}) - private val SPacketSelectAdvancementsTabSetting by setting("SPacketSelectAdvancementsTab", false, { page == PageEnum.Server}) - private val SPacketScoreboardObjectiveSetting by setting("SPacketScoreboardObjective", false, { page == PageEnum.Server}) - private val SPacketRespawnSetting by setting("SPacketRespawn", false, { page == PageEnum.Server}) - private val SPacketResourcePackSendSetting by setting("SPacketResourcePackSend", false, { page == PageEnum.Server}) - private val SPacketRemoveEntityEffectSetting by setting("SPacketRemoveEntityEffect", false, { page == PageEnum.Server}) - private val SPacketRecipeBookSetting by setting("SPacketRecipeBook", false, { page == PageEnum.Server}) - private val SPacketPlayerListItemSetting by setting("SPacketPlayerListItem", false, { page == PageEnum.Server}) - private val SPacketPlayerListHeaderFooterSetting by setting("SPacketPlayerListHeaderFooter", false, { page == PageEnum.Server}) - private val SPacketPlayerAbilitiesSetting by setting("SPacketPlayerAbilities", false, { page == PageEnum.Server}) - private val SPacketPlaceGhostRecipeSetting by setting("SPacketPlaceGhostRecipe", false, { page == PageEnum.Server}) - private val SPacketParticlesSetting by setting("SPacketParticles", false, { page == PageEnum.Server}) - private val SPacketOpenWindowSetting by setting("SPacketOpenWindow", false, { page == PageEnum.Server}) - private val SPacketMultiBlockChangeSetting by setting("SPacketMultiBlockChange", false, { page == PageEnum.Server}) - private val SPacketMapsSetting by setting("SPacketMaps", false, { page == PageEnum.Server}) - private val SPacketKeepAliveSetting by setting("SPacketKeepAlive", false, { page == PageEnum.Server}) - private val SPacketJoinGameSetting by setting("SPacketJoinGame", false, { page == PageEnum.Server}) - private val SPacketHeldItemChangeSetting by setting("SPacketHeldItemChange", false, { page == PageEnum.Server}) - private val SPacketExplosionSetting by setting("SPacketExplosion", false, { page == PageEnum.Server}) - private val SPacketEntityVelocitySetting by setting("SPacketEntityVelocity", false, { page == PageEnum.Server}) - private val SPacketEntityTeleportSetting by setting("SPacketEntityTeleport", false, { page == PageEnum.Server}) - private val SPacketEntityStatusSetting by setting("SPacketEntityStatus", false, { page == PageEnum.Server}) - private val SPacketEntityPropertiesSetting by setting("SPacketEntityProperties", false, { page == PageEnum.Server}) - private val SPacketEntityMetadataSetting by setting("SPacketEntityMetadata", false, { page == PageEnum.Server}) - private val SPacketEntityHeadLookSetting by setting("SPacketEntityHeadLook", false, { page == PageEnum.Server}) - private val SPacketEntityEquipmentSetting by setting("SPacketEntityEquipment", false, { page == PageEnum.Server}) - private val SPacketEntityEffectSetting by setting("SPacketEntityEffect", false, { page == PageEnum.Server}) - private val SPacketEntityAttachSetting by setting("SPacketEntityAttach", false, { page == PageEnum.Server}) - private val SPacketEffectSetting by setting("SPacketEffect", false, { page == PageEnum.Server}) - private val SPacketDisplayObjectiveSetting by setting("SPacketDisplayObjective", false, { page == PageEnum.Server}) - private val SPacketDestroyEntitiesSetting by setting("SPacketDestroyEntities", false, { page == PageEnum.Server}) - private val SPacketCustomSoundSetting by setting("SPacketCustomSound", false, { page == PageEnum.Server}) - private val SPacketCustomPayloadSetting by setting("SPacketCustomPayload", false, { page == PageEnum.Server}) - private val SPacketCooldownSetting by setting("SPacketCooldown", false, { page == PageEnum.Server}) - private val SPacketConfirmTransactionSetting by setting("SPacketConfirmTransaction", false, { page == PageEnum.Server}) - private val SPacketCombatEventSetting by setting("SPacketCombatEvent", false, { page == PageEnum.Server}) - private val SPacketCollectItemSetting by setting("SPacketCollectItem", false, { page == PageEnum.Server}) - private val SPacketCloseWindowSetting by setting("SPacketCloseWindow", false, { page == PageEnum.Server}) - private val SPacketChunkDataSetting by setting("SPacketChunkData", false, { page == PageEnum.Server}) - private val SPacketChatSetting by setting("SPacketChat", false, { page == PageEnum.Server}) - private val SPacketChangeGameStateSetting by setting("SPacketChangeGameState", false, { page == PageEnum.Server}) - private val SPacketCameraSetting by setting("SPacketCamera", false, { page == PageEnum.Server}) - private val SPacketBlockChangeSetting by setting("SPacketBlockChange", false, { page == PageEnum.Server}) - private val SPacketBlockBreakAnimSetting by setting("SPacketBlockBreakAnim", false, { page == PageEnum.Server}) - private val SPacketBlockActionSetting by setting("SPacketBlockAction", false, { page == PageEnum.Server}) - private val SPacketAnimationSetting by setting("SPacketAnimation", false, { page == PageEnum.Server}) - private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { page == PageEnum.Server}) + private val CPacketAnimationSetting by setting("CPacketAnimation", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketUseEntitySetting by setting("CPacketUseEntity", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketChatMessageSetting by setting("CPacketChatMessage", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketClickWindowSetting by setting("CPacketClickWindow", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketClientSettingsSetting by setting("CPacketClient", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketClientStatusSetting by setting("CPacketClientStatus", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketCloseWindowSetting by setting("CPacketCloseWindow", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketConfirmTeleportSetting by setting("CPacketConfirmTeleport", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketConfirmTransactionSetting by setting("CPacketConfirmTransaction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketCreativeInventoryActionSetting by setting("CPacketCreativeInventoryAction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketCustomPayloadSetting by setting("CPacketCustomPayload", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketEnchantItemSetting by setting("CPacketEnchantItem", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketEntityActionSetting by setting("CPacketEntityAction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketPlayerSetting by setting("CPacketPlayer", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketHeldItemChangeSetting by setting("CPacketHeldItemChange", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketInputSetting by setting("CPacketInput", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketPlaceRecipeSetting by setting("CPacketPlaceRecipe", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketPlayerAbilitiesSetting by setting("CPacketPlayerAbilities", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketPlayerTryUseItemSetting by setting("CPacketPlayerTryUseItem", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketPlayerTryUseItemOnBlockSetting by setting("CPacketPlayerTryUseItemOnBlock", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketServerQuerySetting by setting("CPacketServerQuery", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketLoginStartSetting by setting("CPacketLoginStart", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketPingSetting by setting("CPacketPing", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketEncryptionResponseSetting by setting("CPacketEncryptionResponse", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketVehicleMoveSetting by setting("CPacketVehicleMove", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketUpdateSignSetting by setting("CPacketUpdateSign", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketTabCompleteSetting by setting("CPacketTabComplete", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketSteerBoatSetting by setting("CPacketSteerBoat", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketSpectateSetting by setting("CPacketSpectate", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketSeenAdvancementsSetting by setting("CPacketSeenAdvancements", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketResourcePackStatusSetting by setting("CPacketResourcePackStatus", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketRecipeInfoSetting by setting("CPacketRecipeInfo", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) + private val CPacketPlayerDiggingSetting by setting("CPacketPlayerDigging", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) + private val CPacketKeepAliveSetting by setting("CPacketKeepAlive", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + + private val SPacketEntityS17PacketEntityLookMoveSetting by setting("SPacketEntity.S17PacketEntityLookMove", false, { page == Page.SERVER }) + private val SPacketEntityS16PacketEntityLookSetting by setting("SPacketEntity.S16PacketEntityLook", false, { page == Page.SERVER }) + private val SPacketEntityS15PacketEntityRelMoveSetting by setting("SPacketEntity.S15PacketEntityRelMove", false, { page == Page.SERVER }) + private val SPacketServerInfoSetting by setting("SPacketServerInfo", false, { page == Page.SERVER }) + private val SPacketLoginSuccessSetting by setting("SPacketLoginSuccess", false, { page == Page.SERVER }) + private val SPacketWorldBorderSetting by setting("SPacketWorldBorder", false, { page == Page.SERVER }) + private val SPacketWindowPropertySetting by setting("SPacketWindowProperty", false, { page == Page.SERVER }) + private val SPacketWindowItemsSetting by setting("SPacketWindowItems", false, { page == Page.SERVER }) + private val SPacketPongSetting by setting("SPacketPong", false, { page == Page.SERVER }) + private val SPacketEncryptionRequestSetting by setting("SPacketEncryptionRequest", false, { page == Page.SERVER }) + private val SPacketEnableCompressionSetting by setting("SPacketEnableCompression", false, { page == Page.SERVER }) + private val SPacketDisconnectSetting by setting("SPacketDisconnect", false, { page == Page.SERVER }) + private val SPacketUseBedSetting by setting("SPacketUseBed", false, { page == Page.SERVER }) + private val SPacketUpdateTileEntitySetting by setting("SPacketUpdateTileEntity", false, { page == Page.SERVER }) + private val SPacketUpdateScoreSetting by setting("SPacketUpdateScore", false, { page == Page.SERVER }) + private val SPacketUpdateHealthSetting by setting("SPacketUpdateHealth", false, { page == Page.SERVER }) + private val SPacketUpdateBossInfoSetting by setting("SPacketUpdateBossInfo", false, { page == Page.SERVER }) + private val SPacketUnloadChunkSetting by setting("SPacketUnloadChunk", false, { page == Page.SERVER }) + private val SPacketTitleSetting by setting("SPacketTitle", false, { page == Page.SERVER }) + private val SPacketTimeUpdateSetting by setting("SPacketTimeUpdate", false, { page == Page.SERVER }) + private val SPacketTeamsSetting by setting("SPacketTeams", false, { page == Page.SERVER }) + private val SPacketTabCompleteSetting by setting("SPacketTabComplete", false, { page == Page.SERVER }) + private val SPacketStatisticsSetting by setting("SPacketStatistics", false, { page == Page.SERVER }) + private val SPacketSpawnPositionSetting by setting("SPacketSpawnPosition", false, { page == Page.SERVER }) + private val SPacketSpawnPaintingSetting by setting("SPacketSpawnPainting", false, { page == Page.SERVER }) + private val SPacketSpawnObjectSetting by setting("SPacketSpawnObject", false, { page == Page.SERVER }) + private val SPacketSpawnPlayerSetting by setting("SPacketSpawnPlayer", false, { page == Page.SERVER }) + private val SPacketSpawnMobSetting by setting("SPacketSpawnMob", false, { page == Page.SERVER }) + private val SPacketSpawnGlobalEntitySetting by setting("SPacketSpawnGlobalEntity", false, { page == Page.SERVER }) + private val SPacketSpawnExperienceOrbSetting by setting("SPacketSpawnExperienceOrb", false, { page == Page.SERVER }) + private val SPacketSoundEffectSetting by setting("SPacketSoundEffect", false, { page == Page.SERVER }) + private val SPacketSignEditorOpenSetting by setting("SPacketSignEditorOpen", false, { page == Page.SERVER }) + private val SPacketSetSlotSetting by setting("SPacketSetSlot", false, { page == Page.SERVER }) + private val SPacketSetExperienceSetting by setting("SPacketSetExperience", false, { page == Page.SERVER }) + private val SPacketServerDifficultySetting by setting("SPacketServerDifficulty", false, { page == Page.SERVER }) + private val SPacketSelectAdvancementsTabSetting by setting("SPacketSelectAdvancementsTab", false, { page == Page.SERVER }) + private val SPacketScoreboardObjectiveSetting by setting("SPacketScoreboardObjective", false, { page == Page.SERVER }) + private val SPacketRespawnSetting by setting("SPacketRespawn", false, { page == Page.SERVER }) + private val SPacketResourcePackSendSetting by setting("SPacketResourcePackSend", false, { page == Page.SERVER }) + private val SPacketRemoveEntityEffectSetting by setting("SPacketRemoveEntityEffect", false, { page == Page.SERVER }) + private val SPacketRecipeBookSetting by setting("SPacketRecipeBook", false, { page == Page.SERVER }) + private val SPacketPlayerListItemSetting by setting("SPacketPlayerListItem", false, { page == Page.SERVER }) + private val SPacketPlayerListHeaderFooterSetting by setting("SPacketPlayerListHeaderFooter", false, { page == Page.SERVER }) + private val SPacketPlayerAbilitiesSetting by setting("SPacketPlayerAbilities", false, { page == Page.SERVER }) + private val SPacketPlaceGhostRecipeSetting by setting("SPacketPlaceGhostRecipe", false, { page == Page.SERVER }) + private val SPacketParticlesSetting by setting("SPacketParticles", false, { page == Page.SERVER }) + private val SPacketOpenWindowSetting by setting("SPacketOpenWindow", false, { page == Page.SERVER }) + private val SPacketMultiBlockChangeSetting by setting("SPacketMultiBlockChange", false, { page == Page.SERVER }) + private val SPacketMapsSetting by setting("SPacketMaps", false, { page == Page.SERVER }) + private val SPacketKeepAliveSetting by setting("SPacketKeepAlive", false, { page == Page.SERVER }) + private val SPacketJoinGameSetting by setting("SPacketJoinGame", false, { page == Page.SERVER }) + private val SPacketHeldItemChangeSetting by setting("SPacketHeldItemChange", false, { page == Page.SERVER }) + private val SPacketExplosionSetting by setting("SPacketExplosion", false, { page == Page.SERVER }) + private val SPacketEntityVelocitySetting by setting("SPacketEntityVelocity", false, { page == Page.SERVER }) + private val SPacketEntityTeleportSetting by setting("SPacketEntityTeleport", false, { page == Page.SERVER }) + private val SPacketEntityStatusSetting by setting("SPacketEntityStatus", false, { page == Page.SERVER }) + private val SPacketEntityPropertiesSetting by setting("SPacketEntityProperties", false, { page == Page.SERVER }) + private val SPacketEntityMetadataSetting by setting("SPacketEntityMetadata", false, { page == Page.SERVER }) + private val SPacketEntityHeadLookSetting by setting("SPacketEntityHeadLook", false, { page == Page.SERVER }) + private val SPacketEntityEquipmentSetting by setting("SPacketEntityEquipment", false, { page == Page.SERVER }) + private val SPacketEntityEffectSetting by setting("SPacketEntityEffect", false, { page == Page.SERVER }) + private val SPacketEntityAttachSetting by setting("SPacketEntityAttach", false, { page == Page.SERVER }) + private val SPacketEffectSetting by setting("SPacketEffect", false, { page == Page.SERVER }) + private val SPacketDisplayObjectiveSetting by setting("SPacketDisplayObjective", false, { page == Page.SERVER }) + private val SPacketDestroyEntitiesSetting by setting("SPacketDestroyEntities", false, { page == Page.SERVER }) + private val SPacketCustomSoundSetting by setting("SPacketCustomSound", false, { page == Page.SERVER }) + private val SPacketCustomPayloadSetting by setting("SPacketCustomPayload", false, { page == Page.SERVER }) + private val SPacketCooldownSetting by setting("SPacketCooldown", false, { page == Page.SERVER }) + private val SPacketConfirmTransactionSetting by setting("SPacketConfirmTransaction", false, { page == Page.SERVER }) + private val SPacketCombatEventSetting by setting("SPacketCombatEvent", false, { page == Page.SERVER }) + private val SPacketCollectItemSetting by setting("SPacketCollectItem", false, { page == Page.SERVER }) + private val SPacketCloseWindowSetting by setting("SPacketCloseWindow", false, { page == Page.SERVER }) + private val SPacketChunkDataSetting by setting("SPacketChunkData", false, { page == Page.SERVER }) + private val SPacketChatSetting by setting("SPacketChat", false, { page == Page.SERVER }) + private val SPacketChangeGameStateSetting by setting("SPacketChangeGameState", false, { page == Page.SERVER }) + private val SPacketCameraSetting by setting("SPacketCamera", false, { page == Page.SERVER }) + private val SPacketBlockChangeSetting by setting("SPacketBlockChange", false, { page == Page.SERVER }) + private val SPacketBlockBreakAnimSetting by setting("SPacketBlockBreakAnim", false, { page == Page.SERVER }) + private val SPacketBlockActionSetting by setting("SPacketBlockAction", false, { page == Page.SERVER }) + private val SPacketAnimationSetting by setting("SPacketAnimation", false, { page == Page.SERVER }) + private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { page == Page.SERVER }) init { listener { - when(it.packet) { + when (it.packet) { is CPacketAnimation -> if (CPacketAnimationSetting) it.cancel() - is CPacketUseEntity -> if (CPacketUseEntitySetting) it.cancel() + is CPacketUseEntity -> if (CPacketUseEntitySetting) it.cancel() is CPacketChatMessage -> if (CPacketChatMessageSetting) it.cancel() is CPacketClickWindow -> if (CPacketClickWindowSetting) it.cancel() is CPacketClientSettings -> if (CPacketClientSettingsSetting) it.cancel() @@ -181,87 +191,87 @@ object PacketCancel : Module( } listener { when (it.packet) { - is SPacketEntity.S17PacketEntityLookMove -> if(SPacketEntityS17PacketEntityLookMoveSetting) it.cancel() - is SPacketEntity.S16PacketEntityLook -> if(SPacketEntityS16PacketEntityLookSetting) it.cancel() - is SPacketEntity.S15PacketEntityRelMove -> if(SPacketEntityS15PacketEntityRelMoveSetting) it.cancel() - is SPacketServerInfo -> if(SPacketServerInfoSetting) it.cancel() - is SPacketLoginSuccess -> if(SPacketLoginSuccessSetting) it.cancel() - is SPacketWorldBorder -> if(SPacketWorldBorderSetting) it.cancel() - is SPacketWindowProperty -> if(SPacketWindowPropertySetting) it.cancel() - is SPacketWindowItems -> if(SPacketWindowItemsSetting) it.cancel() - is SPacketPong -> if(SPacketPongSetting) it.cancel() - is SPacketEncryptionRequest -> if(SPacketEncryptionRequestSetting) it.cancel() - is SPacketEnableCompression -> if(SPacketEnableCompressionSetting) it.cancel() - is SPacketDisconnect -> if(SPacketDisconnectSetting) it.cancel() - is SPacketUseBed -> if(SPacketUseBedSetting) it.cancel() - is SPacketUpdateTileEntity -> if(SPacketUpdateTileEntitySetting) it.cancel() - is SPacketUpdateScore -> if(SPacketUpdateScoreSetting) it.cancel() - is SPacketUpdateHealth -> if(SPacketUpdateHealthSetting) it.cancel() - is SPacketUpdateBossInfo -> if(SPacketUpdateBossInfoSetting) it.cancel() - is SPacketUnloadChunk -> if(SPacketUnloadChunkSetting) it.cancel() - is SPacketTitle -> if(SPacketTitleSetting) it.cancel() - is SPacketTimeUpdate -> if(SPacketTimeUpdateSetting) it.cancel() - is SPacketTeams -> if(SPacketTeamsSetting) it.cancel() - is SPacketTabComplete -> if(SPacketTabCompleteSetting) it.cancel() - is SPacketStatistics -> if(SPacketStatisticsSetting) it.cancel() - is SPacketSpawnPosition -> if(SPacketSpawnPositionSetting) it.cancel() - is SPacketSpawnPainting -> if(SPacketSpawnPaintingSetting) it.cancel() - is SPacketSpawnObject -> if(SPacketSpawnObjectSetting) it.cancel() - is SPacketSpawnPlayer -> if(SPacketSpawnPlayerSetting) it.cancel() - is SPacketSpawnMob -> if(SPacketSpawnMobSetting) it.cancel() - is SPacketSpawnGlobalEntity -> if(SPacketSpawnGlobalEntitySetting) it.cancel() - is SPacketSpawnExperienceOrb -> if(SPacketSpawnExperienceOrbSetting) it.cancel() - is SPacketSoundEffect -> if(SPacketSoundEffectSetting) it.cancel() - is SPacketSignEditorOpen -> if(SPacketSignEditorOpenSetting) it.cancel() - is SPacketSetSlot -> if(SPacketSetSlotSetting) it.cancel() - is SPacketSetExperience -> if(SPacketSetExperienceSetting) it.cancel() - is SPacketServerDifficulty -> if(SPacketServerDifficultySetting) it.cancel() - is SPacketSelectAdvancementsTab -> if(SPacketSelectAdvancementsTabSetting) it.cancel() - is SPacketScoreboardObjective -> if(SPacketScoreboardObjectiveSetting) it.cancel() - is SPacketRespawn -> if(SPacketRespawnSetting) it.cancel() - is SPacketResourcePackSend -> if(SPacketResourcePackSendSetting) it.cancel() - is SPacketRemoveEntityEffect -> if(SPacketRemoveEntityEffectSetting) it.cancel() - is SPacketRecipeBook -> if(SPacketRecipeBookSetting) it.cancel() - is SPacketPlayerListItem -> if(SPacketPlayerListItemSetting) it.cancel() - is SPacketPlayerListHeaderFooter -> if(SPacketPlayerListHeaderFooterSetting) it.cancel() - is SPacketPlayerAbilities -> if(SPacketPlayerAbilitiesSetting) it.cancel() - is SPacketPlaceGhostRecipe -> if(SPacketPlaceGhostRecipeSetting) it.cancel() - is SPacketParticles -> if(SPacketParticlesSetting) it.cancel() - is SPacketOpenWindow -> if(SPacketOpenWindowSetting) it.cancel() - is SPacketMultiBlockChange -> if(SPacketMultiBlockChangeSetting) it.cancel() - is SPacketMaps -> if(SPacketMapsSetting) it.cancel() - is SPacketKeepAlive -> if(SPacketKeepAliveSetting) it.cancel() - is SPacketJoinGame -> if(SPacketJoinGameSetting) it.cancel() - is SPacketHeldItemChange -> if(SPacketHeldItemChangeSetting) it.cancel() - is SPacketExplosion -> if(SPacketExplosionSetting) it.cancel() - is SPacketEntityVelocity -> if(SPacketEntityVelocitySetting) it.cancel() - is SPacketEntityTeleport -> if(SPacketEntityTeleportSetting) it.cancel() - is SPacketEntityStatus -> if(SPacketEntityStatusSetting) it.cancel() - is SPacketEntityProperties -> if(SPacketEntityPropertiesSetting) it.cancel() - is SPacketEntityMetadata -> if(SPacketEntityMetadataSetting) it.cancel() - is SPacketEntityHeadLook -> if(SPacketEntityHeadLookSetting) it.cancel() - is SPacketEntityEquipment -> if(SPacketEntityEquipmentSetting) it.cancel() - is SPacketEntityEffect -> if(SPacketEntityEffectSetting) it.cancel() - is SPacketEntityAttach -> if(SPacketEntityAttachSetting) it.cancel() - is SPacketEffect -> if(SPacketEffectSetting) it.cancel() - is SPacketDisplayObjective -> if(SPacketDisplayObjectiveSetting) it.cancel() - is SPacketDestroyEntities -> if(SPacketDestroyEntitiesSetting) it.cancel() - is SPacketCustomSound -> if(SPacketCustomSoundSetting) it.cancel() - is SPacketCustomPayload -> if(SPacketCustomPayloadSetting) it.cancel() - is SPacketCooldown -> if(SPacketCooldownSetting) it.cancel() - is SPacketConfirmTransaction -> if(SPacketConfirmTransactionSetting) it.cancel() - is SPacketCombatEvent -> if(SPacketCombatEventSetting) it.cancel() - is SPacketCollectItem -> if(SPacketCollectItemSetting) it.cancel() - is SPacketCloseWindow -> if(SPacketCloseWindowSetting) it.cancel() - is SPacketChunkData -> if(SPacketChunkDataSetting) it.cancel() - is SPacketChat -> if(SPacketChatSetting) it.cancel() - is SPacketChangeGameState -> if(SPacketChangeGameStateSetting) it.cancel() - is SPacketCamera -> if(SPacketCameraSetting) it.cancel() - is SPacketBlockChange -> if(SPacketBlockChangeSetting) it.cancel() - is SPacketBlockBreakAnim -> if(SPacketBlockBreakAnimSetting) it.cancel() - is SPacketBlockAction -> if(SPacketBlockActionSetting) it.cancel() - is SPacketAnimation -> if(SPacketAnimationSetting) it.cancel() - is SPacketAdvancementInfo -> if(SPacketAdvancementInfoSetting) it.cancel() + is SPacketEntity.S17PacketEntityLookMove -> if (SPacketEntityS17PacketEntityLookMoveSetting) it.cancel() + is SPacketEntity.S16PacketEntityLook -> if (SPacketEntityS16PacketEntityLookSetting) it.cancel() + is SPacketEntity.S15PacketEntityRelMove -> if (SPacketEntityS15PacketEntityRelMoveSetting) it.cancel() + is SPacketServerInfo -> if (SPacketServerInfoSetting) it.cancel() + is SPacketLoginSuccess -> if (SPacketLoginSuccessSetting) it.cancel() + is SPacketWorldBorder -> if (SPacketWorldBorderSetting) it.cancel() + is SPacketWindowProperty -> if (SPacketWindowPropertySetting) it.cancel() + is SPacketWindowItems -> if (SPacketWindowItemsSetting) it.cancel() + is SPacketPong -> if (SPacketPongSetting) it.cancel() + is SPacketEncryptionRequest -> if (SPacketEncryptionRequestSetting) it.cancel() + is SPacketEnableCompression -> if (SPacketEnableCompressionSetting) it.cancel() + is SPacketDisconnect -> if (SPacketDisconnectSetting) it.cancel() + is SPacketUseBed -> if (SPacketUseBedSetting) it.cancel() + is SPacketUpdateTileEntity -> if (SPacketUpdateTileEntitySetting) it.cancel() + is SPacketUpdateScore -> if (SPacketUpdateScoreSetting) it.cancel() + is SPacketUpdateHealth -> if (SPacketUpdateHealthSetting) it.cancel() + is SPacketUpdateBossInfo -> if (SPacketUpdateBossInfoSetting) it.cancel() + is SPacketUnloadChunk -> if (SPacketUnloadChunkSetting) it.cancel() + is SPacketTitle -> if (SPacketTitleSetting) it.cancel() + is SPacketTimeUpdate -> if (SPacketTimeUpdateSetting) it.cancel() + is SPacketTeams -> if (SPacketTeamsSetting) it.cancel() + is SPacketTabComplete -> if (SPacketTabCompleteSetting) it.cancel() + is SPacketStatistics -> if (SPacketStatisticsSetting) it.cancel() + is SPacketSpawnPosition -> if (SPacketSpawnPositionSetting) it.cancel() + is SPacketSpawnPainting -> if (SPacketSpawnPaintingSetting) it.cancel() + is SPacketSpawnObject -> if (SPacketSpawnObjectSetting) it.cancel() + is SPacketSpawnPlayer -> if (SPacketSpawnPlayerSetting) it.cancel() + is SPacketSpawnMob -> if (SPacketSpawnMobSetting) it.cancel() + is SPacketSpawnGlobalEntity -> if (SPacketSpawnGlobalEntitySetting) it.cancel() + is SPacketSpawnExperienceOrb -> if (SPacketSpawnExperienceOrbSetting) it.cancel() + is SPacketSoundEffect -> if (SPacketSoundEffectSetting) it.cancel() + is SPacketSignEditorOpen -> if (SPacketSignEditorOpenSetting) it.cancel() + is SPacketSetSlot -> if (SPacketSetSlotSetting) it.cancel() + is SPacketSetExperience -> if (SPacketSetExperienceSetting) it.cancel() + is SPacketServerDifficulty -> if (SPacketServerDifficultySetting) it.cancel() + is SPacketSelectAdvancementsTab -> if (SPacketSelectAdvancementsTabSetting) it.cancel() + is SPacketScoreboardObjective -> if (SPacketScoreboardObjectiveSetting) it.cancel() + is SPacketRespawn -> if (SPacketRespawnSetting) it.cancel() + is SPacketResourcePackSend -> if (SPacketResourcePackSendSetting) it.cancel() + is SPacketRemoveEntityEffect -> if (SPacketRemoveEntityEffectSetting) it.cancel() + is SPacketRecipeBook -> if (SPacketRecipeBookSetting) it.cancel() + is SPacketPlayerListItem -> if (SPacketPlayerListItemSetting) it.cancel() + is SPacketPlayerListHeaderFooter -> if (SPacketPlayerListHeaderFooterSetting) it.cancel() + is SPacketPlayerAbilities -> if (SPacketPlayerAbilitiesSetting) it.cancel() + is SPacketPlaceGhostRecipe -> if (SPacketPlaceGhostRecipeSetting) it.cancel() + is SPacketParticles -> if (SPacketParticlesSetting) it.cancel() + is SPacketOpenWindow -> if (SPacketOpenWindowSetting) it.cancel() + is SPacketMultiBlockChange -> if (SPacketMultiBlockChangeSetting) it.cancel() + is SPacketMaps -> if (SPacketMapsSetting) it.cancel() + is SPacketKeepAlive -> if (SPacketKeepAliveSetting) it.cancel() + is SPacketJoinGame -> if (SPacketJoinGameSetting) it.cancel() + is SPacketHeldItemChange -> if (SPacketHeldItemChangeSetting) it.cancel() + is SPacketExplosion -> if (SPacketExplosionSetting) it.cancel() + is SPacketEntityVelocity -> if (SPacketEntityVelocitySetting) it.cancel() + is SPacketEntityTeleport -> if (SPacketEntityTeleportSetting) it.cancel() + is SPacketEntityStatus -> if (SPacketEntityStatusSetting) it.cancel() + is SPacketEntityProperties -> if (SPacketEntityPropertiesSetting) it.cancel() + is SPacketEntityMetadata -> if (SPacketEntityMetadataSetting) it.cancel() + is SPacketEntityHeadLook -> if (SPacketEntityHeadLookSetting) it.cancel() + is SPacketEntityEquipment -> if (SPacketEntityEquipmentSetting) it.cancel() + is SPacketEntityEffect -> if (SPacketEntityEffectSetting) it.cancel() + is SPacketEntityAttach -> if (SPacketEntityAttachSetting) it.cancel() + is SPacketEffect -> if (SPacketEffectSetting) it.cancel() + is SPacketDisplayObjective -> if (SPacketDisplayObjectiveSetting) it.cancel() + is SPacketDestroyEntities -> if (SPacketDestroyEntitiesSetting) it.cancel() + is SPacketCustomSound -> if (SPacketCustomSoundSetting) it.cancel() + is SPacketCustomPayload -> if (SPacketCustomPayloadSetting) it.cancel() + is SPacketCooldown -> if (SPacketCooldownSetting) it.cancel() + is SPacketConfirmTransaction -> if (SPacketConfirmTransactionSetting) it.cancel() + is SPacketCombatEvent -> if (SPacketCombatEventSetting) it.cancel() + is SPacketCollectItem -> if (SPacketCollectItemSetting) it.cancel() + is SPacketCloseWindow -> if (SPacketCloseWindowSetting) it.cancel() + is SPacketChunkData -> if (SPacketChunkDataSetting) it.cancel() + is SPacketChat -> if (SPacketChatSetting) it.cancel() + is SPacketChangeGameState -> if (SPacketChangeGameStateSetting) it.cancel() + is SPacketCamera -> if (SPacketCameraSetting) it.cancel() + is SPacketBlockChange -> if (SPacketBlockChangeSetting) it.cancel() + is SPacketBlockBreakAnim -> if (SPacketBlockBreakAnimSetting) it.cancel() + is SPacketBlockAction -> if (SPacketBlockActionSetting) it.cancel() + is SPacketAnimation -> if (SPacketAnimationSetting) it.cancel() + is SPacketAdvancementInfo -> if (SPacketAdvancementInfoSetting) it.cancel() } } } From d9ef019fc662059f90951d7c0d5af23052ae292c Mon Sep 17 00:00:00 2001 From: Constructor Date: Thu, 6 Jan 2022 19:12:08 +0100 Subject: [PATCH 3/6] Finish categories --- .../module/modules/player/PacketCancel.kt | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt index 5eb3e01e9..cc9d8afc1 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt @@ -21,134 +21,134 @@ object PacketCancel : Module( description = "Cancels specific packets used for various actions", category = Category.PLAYER ) { - enum class Page { + enum class Side { CLIENT, SERVER } - enum class CategoryEnum { - PLAYER, INVENTORY, CLIENT + enum class CategorySlider { + PLAYER, INVENTORY, SYSTEM, WORLD, ENTITY } - private val page by setting("Page", Page.CLIENT) + private val side by setting("Side", Side.CLIENT) - private val categorySetting by setting("Category", CategoryEnum.PLAYER) + private val categorySetting by setting("Category", CategorySlider.PLAYER) - private val CPacketAnimationSetting by setting("CPacketAnimation", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketUseEntitySetting by setting("CPacketUseEntity", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketChatMessageSetting by setting("CPacketChatMessage", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketClickWindowSetting by setting("CPacketClickWindow", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketClientSettingsSetting by setting("CPacketClient", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketClientStatusSetting by setting("CPacketClientStatus", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketCloseWindowSetting by setting("CPacketCloseWindow", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketConfirmTeleportSetting by setting("CPacketConfirmTeleport", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketConfirmTransactionSetting by setting("CPacketConfirmTransaction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketCreativeInventoryActionSetting by setting("CPacketCreativeInventoryAction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketCustomPayloadSetting by setting("CPacketCustomPayload", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketEnchantItemSetting by setting("CPacketEnchantItem", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketEntityActionSetting by setting("CPacketEntityAction", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketPlayerSetting by setting("CPacketPlayer", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketHeldItemChangeSetting by setting("CPacketHeldItemChange", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketInputSetting by setting("CPacketInput", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketPlaceRecipeSetting by setting("CPacketPlaceRecipe", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketPlayerAbilitiesSetting by setting("CPacketPlayerAbilities", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketPlayerTryUseItemSetting by setting("CPacketPlayerTryUseItem", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketPlayerTryUseItemOnBlockSetting by setting("CPacketPlayerTryUseItemOnBlock", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketServerQuerySetting by setting("CPacketServerQuery", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketLoginStartSetting by setting("CPacketLoginStart", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketPingSetting by setting("CPacketPing", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketEncryptionResponseSetting by setting("CPacketEncryptionResponse", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketVehicleMoveSetting by setting("CPacketVehicleMove", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketUpdateSignSetting by setting("CPacketUpdateSign", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketTabCompleteSetting by setting("CPacketTabComplete", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketSteerBoatSetting by setting("CPacketSteerBoat", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketSpectateSetting by setting("CPacketSpectate", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketSeenAdvancementsSetting by setting("CPacketSeenAdvancements", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketResourcePackStatusSetting by setting("CPacketResourcePackStatus", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) - private val CPacketRecipeInfoSetting by setting("CPacketRecipeInfo", false, { page == Page.CLIENT && categorySetting == CategoryEnum.INVENTORY }) - private val CPacketPlayerDiggingSetting by setting("CPacketPlayerDigging", false, { page == Page.CLIENT && categorySetting == CategoryEnum.PLAYER }) - private val CPacketKeepAliveSetting by setting("CPacketKeepAlive", false, { page == Page.CLIENT && categorySetting == CategoryEnum.CLIENT }) + private val CPacketAnimationSetting by setting("CPacketAnimation", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketUseEntitySetting by setting("CPacketUseEntity", false, { side == Side.CLIENT && categorySetting == CategorySlider.ENTITY }) + private val CPacketChatMessageSetting by setting("CPacketChatMessage", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketClickWindowSetting by setting("CPacketClickWindow", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketClientSettingsSetting by setting("CPacketClient", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketClientStatusSetting by setting("CPacketClientStatus", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketCloseWindowSetting by setting("CPacketCloseWindow", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketConfirmTeleportSetting by setting("CPacketConfirmTeleport", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketConfirmTransactionSetting by setting("CPacketConfirmTransaction", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketCreativeInventoryActionSetting by setting("CPacketCreativeInventoryAction", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketCustomPayloadSetting by setting("CPacketCustomPayload", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketEnchantItemSetting by setting("CPacketEnchantItem", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketEntityActionSetting by setting("CPacketEntityAction", false, { side == Side.CLIENT && categorySetting == CategorySlider.ENTITY }) + private val CPacketPlayerSetting by setting("CPacketPlayer", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketHeldItemChangeSetting by setting("CPacketHeldItemChange", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketInputSetting by setting("CPacketInput", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketPlaceRecipeSetting by setting("CPacketPlaceRecipe", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketPlayerAbilitiesSetting by setting("CPacketPlayerAbilities", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketPlayerTryUseItemSetting by setting("CPacketPlayerTryUseItem", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketPlayerTryUseItemOnBlockSetting by setting("CPacketPlayerTryUseItemOnBlock", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketServerQuerySetting by setting("CPacketServerQuery", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketLoginStartSetting by setting("CPacketLoginStart", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketPingSetting by setting("CPacketPing", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketEncryptionResponseSetting by setting("CPacketEncryptionResponse", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketVehicleMoveSetting by setting("CPacketVehicleMove", false, { side == Side.CLIENT && categorySetting == CategorySlider.ENTITY }) + private val CPacketUpdateSignSetting by setting("CPacketUpdateSign", false, { side == Side.CLIENT && categorySetting == CategorySlider.WORLD }) + private val CPacketTabCompleteSetting by setting("CPacketTabComplete", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketSteerBoatSetting by setting("CPacketSteerBoat", false, { side == Side.CLIENT && categorySetting == CategorySlider.ENTITY }) + private val CPacketSpectateSetting by setting("CPacketSpectate", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketSeenAdvancementsSetting by setting("CPacketSeenAdvancements", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketResourcePackStatusSetting by setting("CPacketResourcePackStatus", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) + private val CPacketRecipeInfoSetting by setting("CPacketRecipeInfo", false, { side == Side.CLIENT && categorySetting == CategorySlider.INVENTORY }) + private val CPacketPlayerDiggingSetting by setting("CPacketPlayerDigging", false, { side == Side.CLIENT && categorySetting == CategorySlider.PLAYER }) + private val CPacketKeepAliveSetting by setting("CPacketKeepAlive", false, { side == Side.CLIENT && categorySetting == CategorySlider.SYSTEM }) - private val SPacketEntityS17PacketEntityLookMoveSetting by setting("SPacketEntity.S17PacketEntityLookMove", false, { page == Page.SERVER }) - private val SPacketEntityS16PacketEntityLookSetting by setting("SPacketEntity.S16PacketEntityLook", false, { page == Page.SERVER }) - private val SPacketEntityS15PacketEntityRelMoveSetting by setting("SPacketEntity.S15PacketEntityRelMove", false, { page == Page.SERVER }) - private val SPacketServerInfoSetting by setting("SPacketServerInfo", false, { page == Page.SERVER }) - private val SPacketLoginSuccessSetting by setting("SPacketLoginSuccess", false, { page == Page.SERVER }) - private val SPacketWorldBorderSetting by setting("SPacketWorldBorder", false, { page == Page.SERVER }) - private val SPacketWindowPropertySetting by setting("SPacketWindowProperty", false, { page == Page.SERVER }) - private val SPacketWindowItemsSetting by setting("SPacketWindowItems", false, { page == Page.SERVER }) - private val SPacketPongSetting by setting("SPacketPong", false, { page == Page.SERVER }) - private val SPacketEncryptionRequestSetting by setting("SPacketEncryptionRequest", false, { page == Page.SERVER }) - private val SPacketEnableCompressionSetting by setting("SPacketEnableCompression", false, { page == Page.SERVER }) - private val SPacketDisconnectSetting by setting("SPacketDisconnect", false, { page == Page.SERVER }) - private val SPacketUseBedSetting by setting("SPacketUseBed", false, { page == Page.SERVER }) - private val SPacketUpdateTileEntitySetting by setting("SPacketUpdateTileEntity", false, { page == Page.SERVER }) - private val SPacketUpdateScoreSetting by setting("SPacketUpdateScore", false, { page == Page.SERVER }) - private val SPacketUpdateHealthSetting by setting("SPacketUpdateHealth", false, { page == Page.SERVER }) - private val SPacketUpdateBossInfoSetting by setting("SPacketUpdateBossInfo", false, { page == Page.SERVER }) - private val SPacketUnloadChunkSetting by setting("SPacketUnloadChunk", false, { page == Page.SERVER }) - private val SPacketTitleSetting by setting("SPacketTitle", false, { page == Page.SERVER }) - private val SPacketTimeUpdateSetting by setting("SPacketTimeUpdate", false, { page == Page.SERVER }) - private val SPacketTeamsSetting by setting("SPacketTeams", false, { page == Page.SERVER }) - private val SPacketTabCompleteSetting by setting("SPacketTabComplete", false, { page == Page.SERVER }) - private val SPacketStatisticsSetting by setting("SPacketStatistics", false, { page == Page.SERVER }) - private val SPacketSpawnPositionSetting by setting("SPacketSpawnPosition", false, { page == Page.SERVER }) - private val SPacketSpawnPaintingSetting by setting("SPacketSpawnPainting", false, { page == Page.SERVER }) - private val SPacketSpawnObjectSetting by setting("SPacketSpawnObject", false, { page == Page.SERVER }) - private val SPacketSpawnPlayerSetting by setting("SPacketSpawnPlayer", false, { page == Page.SERVER }) - private val SPacketSpawnMobSetting by setting("SPacketSpawnMob", false, { page == Page.SERVER }) - private val SPacketSpawnGlobalEntitySetting by setting("SPacketSpawnGlobalEntity", false, { page == Page.SERVER }) - private val SPacketSpawnExperienceOrbSetting by setting("SPacketSpawnExperienceOrb", false, { page == Page.SERVER }) - private val SPacketSoundEffectSetting by setting("SPacketSoundEffect", false, { page == Page.SERVER }) - private val SPacketSignEditorOpenSetting by setting("SPacketSignEditorOpen", false, { page == Page.SERVER }) - private val SPacketSetSlotSetting by setting("SPacketSetSlot", false, { page == Page.SERVER }) - private val SPacketSetExperienceSetting by setting("SPacketSetExperience", false, { page == Page.SERVER }) - private val SPacketServerDifficultySetting by setting("SPacketServerDifficulty", false, { page == Page.SERVER }) - private val SPacketSelectAdvancementsTabSetting by setting("SPacketSelectAdvancementsTab", false, { page == Page.SERVER }) - private val SPacketScoreboardObjectiveSetting by setting("SPacketScoreboardObjective", false, { page == Page.SERVER }) - private val SPacketRespawnSetting by setting("SPacketRespawn", false, { page == Page.SERVER }) - private val SPacketResourcePackSendSetting by setting("SPacketResourcePackSend", false, { page == Page.SERVER }) - private val SPacketRemoveEntityEffectSetting by setting("SPacketRemoveEntityEffect", false, { page == Page.SERVER }) - private val SPacketRecipeBookSetting by setting("SPacketRecipeBook", false, { page == Page.SERVER }) - private val SPacketPlayerListItemSetting by setting("SPacketPlayerListItem", false, { page == Page.SERVER }) - private val SPacketPlayerListHeaderFooterSetting by setting("SPacketPlayerListHeaderFooter", false, { page == Page.SERVER }) - private val SPacketPlayerAbilitiesSetting by setting("SPacketPlayerAbilities", false, { page == Page.SERVER }) - private val SPacketPlaceGhostRecipeSetting by setting("SPacketPlaceGhostRecipe", false, { page == Page.SERVER }) - private val SPacketParticlesSetting by setting("SPacketParticles", false, { page == Page.SERVER }) - private val SPacketOpenWindowSetting by setting("SPacketOpenWindow", false, { page == Page.SERVER }) - private val SPacketMultiBlockChangeSetting by setting("SPacketMultiBlockChange", false, { page == Page.SERVER }) - private val SPacketMapsSetting by setting("SPacketMaps", false, { page == Page.SERVER }) - private val SPacketKeepAliveSetting by setting("SPacketKeepAlive", false, { page == Page.SERVER }) - private val SPacketJoinGameSetting by setting("SPacketJoinGame", false, { page == Page.SERVER }) - private val SPacketHeldItemChangeSetting by setting("SPacketHeldItemChange", false, { page == Page.SERVER }) - private val SPacketExplosionSetting by setting("SPacketExplosion", false, { page == Page.SERVER }) - private val SPacketEntityVelocitySetting by setting("SPacketEntityVelocity", false, { page == Page.SERVER }) - private val SPacketEntityTeleportSetting by setting("SPacketEntityTeleport", false, { page == Page.SERVER }) - private val SPacketEntityStatusSetting by setting("SPacketEntityStatus", false, { page == Page.SERVER }) - private val SPacketEntityPropertiesSetting by setting("SPacketEntityProperties", false, { page == Page.SERVER }) - private val SPacketEntityMetadataSetting by setting("SPacketEntityMetadata", false, { page == Page.SERVER }) - private val SPacketEntityHeadLookSetting by setting("SPacketEntityHeadLook", false, { page == Page.SERVER }) - private val SPacketEntityEquipmentSetting by setting("SPacketEntityEquipment", false, { page == Page.SERVER }) - private val SPacketEntityEffectSetting by setting("SPacketEntityEffect", false, { page == Page.SERVER }) - private val SPacketEntityAttachSetting by setting("SPacketEntityAttach", false, { page == Page.SERVER }) - private val SPacketEffectSetting by setting("SPacketEffect", false, { page == Page.SERVER }) - private val SPacketDisplayObjectiveSetting by setting("SPacketDisplayObjective", false, { page == Page.SERVER }) - private val SPacketDestroyEntitiesSetting by setting("SPacketDestroyEntities", false, { page == Page.SERVER }) - private val SPacketCustomSoundSetting by setting("SPacketCustomSound", false, { page == Page.SERVER }) - private val SPacketCustomPayloadSetting by setting("SPacketCustomPayload", false, { page == Page.SERVER }) - private val SPacketCooldownSetting by setting("SPacketCooldown", false, { page == Page.SERVER }) - private val SPacketConfirmTransactionSetting by setting("SPacketConfirmTransaction", false, { page == Page.SERVER }) - private val SPacketCombatEventSetting by setting("SPacketCombatEvent", false, { page == Page.SERVER }) - private val SPacketCollectItemSetting by setting("SPacketCollectItem", false, { page == Page.SERVER }) - private val SPacketCloseWindowSetting by setting("SPacketCloseWindow", false, { page == Page.SERVER }) - private val SPacketChunkDataSetting by setting("SPacketChunkData", false, { page == Page.SERVER }) - private val SPacketChatSetting by setting("SPacketChat", false, { page == Page.SERVER }) - private val SPacketChangeGameStateSetting by setting("SPacketChangeGameState", false, { page == Page.SERVER }) - private val SPacketCameraSetting by setting("SPacketCamera", false, { page == Page.SERVER }) - private val SPacketBlockChangeSetting by setting("SPacketBlockChange", false, { page == Page.SERVER }) - private val SPacketBlockBreakAnimSetting by setting("SPacketBlockBreakAnim", false, { page == Page.SERVER }) - private val SPacketBlockActionSetting by setting("SPacketBlockAction", false, { page == Page.SERVER }) - private val SPacketAnimationSetting by setting("SPacketAnimation", false, { page == Page.SERVER }) - private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { page == Page.SERVER }) + private val SPacketEntityS17PacketEntityLookMoveSetting by setting("SPacketEntity.S17PacketEntityLookMove", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityS16PacketEntityLookSetting by setting("SPacketEntity.S16PacketEntityLook", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityS15PacketEntityRelMoveSetting by setting("SPacketEntity.S15PacketEntityRelMove", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketServerInfoSetting by setting("SPacketServerInfo", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketLoginSuccessSetting by setting("SPacketLoginSuccess", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketWorldBorderSetting by setting("SPacketWorldBorder", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketWindowPropertySetting by setting("SPacketWindowProperty", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketWindowItemsSetting by setting("SPacketWindowItems", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketPongSetting by setting("SPacketPong", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketEncryptionRequestSetting by setting("SPacketEncryptionRequest", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketEnableCompressionSetting by setting("SPacketEnableCompression", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketDisconnectSetting by setting("SPacketDisconnect", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketUseBedSetting by setting("SPacketUseBed", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketUpdateTileEntitySetting by setting("SPacketUpdateTileEntity", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketUpdateScoreSetting by setting("SPacketUpdateScore", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketUpdateHealthSetting by setting("SPacketUpdateHealth", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketUpdateBossInfoSetting by setting("SPacketUpdateBossInfo", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketUnloadChunkSetting by setting("SPacketUnloadChunk", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketTitleSetting by setting("SPacketTitle", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketTimeUpdateSetting by setting("SPacketTimeUpdate", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketTeamsSetting by setting("SPacketTeams", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketTabCompleteSetting by setting("SPacketTabComplete", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketStatisticsSetting by setting("SPacketStatistics", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketSpawnPositionSetting by setting("SPacketSpawnPosition", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketSpawnPaintingSetting by setting("SPacketSpawnPainting", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketSpawnObjectSetting by setting("SPacketSpawnObject", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketSpawnPlayerSetting by setting("SPacketSpawnPlayer", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketSpawnMobSetting by setting("SPacketSpawnMob", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketSpawnGlobalEntitySetting by setting("SPacketSpawnGlobalEntity", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketSpawnExperienceOrbSetting by setting("SPacketSpawnExperienceOrb", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketSoundEffectSetting by setting("SPacketSoundEffect", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketSignEditorOpenSetting by setting("SPacketSignEditorOpen", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketSetSlotSetting by setting("SPacketSetSlot", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketSetExperienceSetting by setting("SPacketSetExperience", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketServerDifficultySetting by setting("SPacketServerDifficulty", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketSelectAdvancementsTabSetting by setting("SPacketSelectAdvancementsTab", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketScoreboardObjectiveSetting by setting("SPacketScoreboardObjective", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketRespawnSetting by setting("SPacketRespawn", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketResourcePackSendSetting by setting("SPacketResourcePackSend", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketRemoveEntityEffectSetting by setting("SPacketRemoveEntityEffect", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketRecipeBookSetting by setting("SPacketRecipeBook", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketPlayerListItemSetting by setting("SPacketPlayerListItem", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketPlayerListHeaderFooterSetting by setting("SPacketPlayerListHeaderFooter", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketPlayerAbilitiesSetting by setting("SPacketPlayerAbilities", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketPlaceGhostRecipeSetting by setting("SPacketPlaceGhostRecipe", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketParticlesSetting by setting("SPacketParticles", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketOpenWindowSetting by setting("SPacketOpenWindow", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketMultiBlockChangeSetting by setting("SPacketMultiBlockChange", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketMapsSetting by setting("SPacketMaps", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketKeepAliveSetting by setting("SPacketKeepAlive", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketJoinGameSetting by setting("SPacketJoinGame", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketHeldItemChangeSetting by setting("SPacketHeldItemChange", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketExplosionSetting by setting("SPacketExplosion", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketEntityVelocitySetting by setting("SPacketEntityVelocity", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityTeleportSetting by setting("SPacketEntityTeleport", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityStatusSetting by setting("SPacketEntityStatus", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY}) + private val SPacketEntityPropertiesSetting by setting("SPacketEntityProperties", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityMetadataSetting by setting("SPacketEntityMetadata", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityHeadLookSetting by setting("SPacketEntityHeadLook", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityEquipmentSetting by setting("SPacketEntityEquipment", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityEffectSetting by setting("SPacketEntityEffect", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEntityAttachSetting by setting("SPacketEntityAttach", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketEffectSetting by setting("SPacketEffect", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketDisplayObjectiveSetting by setting("SPacketDisplayObjective", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketDestroyEntitiesSetting by setting("SPacketDestroyEntities", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketCustomSoundSetting by setting("SPacketCustomSound", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketCustomPayloadSetting by setting("SPacketCustomPayload", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketCooldownSetting by setting("SPacketCooldown", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketConfirmTransactionSetting by setting("SPacketConfirmTransaction", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketCombatEventSetting by setting("SPacketCombatEvent", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketCollectItemSetting by setting("SPacketCollectItem", false, { side == Side.SERVER && categorySetting == CategorySlider.ENTITY }) + private val SPacketCloseWindowSetting by setting("SPacketCloseWindow", false, { side == Side.SERVER && categorySetting == CategorySlider.INVENTORY }) + private val SPacketChunkDataSetting by setting("SPacketChunkData", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketChatSetting by setting("SPacketChat", false, { side == Side.SERVER && categorySetting == CategorySlider.SYSTEM }) + private val SPacketChangeGameStateSetting by setting("SPacketChangeGameState", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketCameraSetting by setting("SPacketCamera", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketBlockChangeSetting by setting("SPacketBlockChange", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketBlockBreakAnimSetting by setting("SPacketBlockBreakAnim", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketBlockActionSetting by setting("SPacketBlockAction", false, { side == Side.SERVER && categorySetting == CategorySlider.WORLD }) + private val SPacketAnimationSetting by setting("SPacketAnimation", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) init { listener { From a31b105a7b6b01de0c630e82500f98c21cbeec65 Mon Sep 17 00:00:00 2001 From: Constructor Date: Thu, 6 Jan 2022 19:22:36 +0100 Subject: [PATCH 4/6] Bring back counter --- .../module/modules/player/PacketCancel.kt | 240 +++++++++--------- 1 file changed, 125 insertions(+), 115 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt index cc9d8afc1..614481766 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/player/PacketCancel.kt @@ -150,128 +150,138 @@ object PacketCancel : Module( private val SPacketAnimationSetting by setting("SPacketAnimation", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) private val SPacketAdvancementInfoSetting by setting("SPacketAdvancementInfo", false, { side == Side.SERVER && categorySetting == CategorySlider.PLAYER }) + private var numPackets = 0 + + override fun getHudInfo(): String { + return numPackets.toString() + } + init { + onDisable { + numPackets = 0 + } + listener { when (it.packet) { - is CPacketAnimation -> if (CPacketAnimationSetting) it.cancel() - is CPacketUseEntity -> if (CPacketUseEntitySetting) it.cancel() - is CPacketChatMessage -> if (CPacketChatMessageSetting) it.cancel() - is CPacketClickWindow -> if (CPacketClickWindowSetting) it.cancel() - is CPacketClientSettings -> if (CPacketClientSettingsSetting) it.cancel() - is CPacketClientStatus -> if (CPacketClientStatusSetting) it.cancel() - is CPacketCloseWindow -> if (CPacketCloseWindowSetting) it.cancel() - is CPacketConfirmTeleport -> if (CPacketConfirmTeleportSetting) it.cancel() - is CPacketConfirmTransaction -> if (CPacketConfirmTransactionSetting) it.cancel() - is CPacketCreativeInventoryAction -> if (CPacketCreativeInventoryActionSetting) it.cancel() - is CPacketCustomPayload -> if (CPacketCustomPayloadSetting) it.cancel() - is CPacketEnchantItem -> if (CPacketEnchantItemSetting) it.cancel() - is CPacketEntityAction -> if (CPacketEntityActionSetting) it.cancel() - is CPacketPlayer -> if (CPacketPlayerSetting) it.cancel() - is CPacketHeldItemChange -> if (CPacketHeldItemChangeSetting) it.cancel() - is CPacketInput -> if (CPacketInputSetting) it.cancel() - is CPacketPlaceRecipe -> if (CPacketPlaceRecipeSetting) it.cancel() - is CPacketPlayerAbilities -> if (CPacketPlayerAbilitiesSetting) it.cancel() - is CPacketPlayerTryUseItem -> if (CPacketPlayerTryUseItemSetting) it.cancel() - is CPacketPlayerTryUseItemOnBlock -> if (CPacketPlayerTryUseItemOnBlockSetting) it.cancel() - is CPacketServerQuery -> if (CPacketServerQuerySetting) it.cancel() - is CPacketLoginStart -> if (CPacketLoginStartSetting) it.cancel() - is CPacketPing -> if (CPacketPingSetting) it.cancel() - is CPacketEncryptionResponse -> if (CPacketEncryptionResponseSetting) it.cancel() - is CPacketVehicleMove -> if (CPacketVehicleMoveSetting) it.cancel() - is CPacketUpdateSign -> if (CPacketUpdateSignSetting) it.cancel() - is CPacketTabComplete -> if (CPacketTabCompleteSetting) it.cancel() - is CPacketSteerBoat -> if (CPacketSteerBoatSetting) it.cancel() - is CPacketSpectate -> if (CPacketSpectateSetting) it.cancel() - is CPacketSeenAdvancements -> if (CPacketSeenAdvancementsSetting) it.cancel() - is CPacketResourcePackStatus -> if (CPacketResourcePackStatusSetting) it.cancel() - is CPacketRecipeInfo -> if (CPacketRecipeInfoSetting) it.cancel() - is CPacketPlayerDigging -> if (CPacketPlayerDiggingSetting) it.cancel() - is CPacketKeepAlive -> if (CPacketKeepAliveSetting) it.cancel() + is CPacketAnimation -> if (CPacketAnimationSetting) it.cancel().also { numPackets++ } + is CPacketUseEntity -> if (CPacketUseEntitySetting) it.cancel().also { numPackets++ } + is CPacketChatMessage -> if (CPacketChatMessageSetting) it.cancel().also { numPackets++ } + is CPacketClickWindow -> if (CPacketClickWindowSetting) it.cancel().also { numPackets++ } + is CPacketClientSettings -> if (CPacketClientSettingsSetting) it.cancel().also { numPackets++ } + is CPacketClientStatus -> if (CPacketClientStatusSetting) it.cancel().also { numPackets++ } + is CPacketCloseWindow -> if (CPacketCloseWindowSetting) it.cancel().also { numPackets++ } + is CPacketConfirmTeleport -> if (CPacketConfirmTeleportSetting) it.cancel().also { numPackets++ } + is CPacketConfirmTransaction -> if (CPacketConfirmTransactionSetting) it.cancel().also { numPackets++ } + is CPacketCreativeInventoryAction -> if (CPacketCreativeInventoryActionSetting) it.cancel().also { numPackets++ } + is CPacketCustomPayload -> if (CPacketCustomPayloadSetting) it.cancel().also { numPackets++ } + is CPacketEnchantItem -> if (CPacketEnchantItemSetting) it.cancel().also { numPackets++ } + is CPacketEntityAction -> if (CPacketEntityActionSetting) it.cancel().also { numPackets++ } + is CPacketPlayer -> if (CPacketPlayerSetting) it.cancel().also { numPackets++ } + is CPacketHeldItemChange -> if (CPacketHeldItemChangeSetting) it.cancel().also { numPackets++ } + is CPacketInput -> if (CPacketInputSetting) it.cancel().also { numPackets++ } + is CPacketPlaceRecipe -> if (CPacketPlaceRecipeSetting) it.cancel().also { numPackets++ } + is CPacketPlayerAbilities -> if (CPacketPlayerAbilitiesSetting) it.cancel().also { numPackets++ } + is CPacketPlayerTryUseItem -> if (CPacketPlayerTryUseItemSetting) it.cancel().also { numPackets++ } + is CPacketPlayerTryUseItemOnBlock -> if (CPacketPlayerTryUseItemOnBlockSetting) it.cancel().also { numPackets++ } + is CPacketServerQuery -> if (CPacketServerQuerySetting) it.cancel().also { numPackets++ } + is CPacketLoginStart -> if (CPacketLoginStartSetting) it.cancel().also { numPackets++ } + is CPacketPing -> if (CPacketPingSetting) it.cancel().also { numPackets++ } + is CPacketEncryptionResponse -> if (CPacketEncryptionResponseSetting) it.cancel().also { numPackets++ } + is CPacketVehicleMove -> if (CPacketVehicleMoveSetting) it.cancel().also { numPackets++ } + is CPacketUpdateSign -> if (CPacketUpdateSignSetting) it.cancel().also { numPackets++ } + is CPacketTabComplete -> if (CPacketTabCompleteSetting) it.cancel().also { numPackets++ } + is CPacketSteerBoat -> if (CPacketSteerBoatSetting) it.cancel().also { numPackets++ } + is CPacketSpectate -> if (CPacketSpectateSetting) it.cancel().also { numPackets++ } + is CPacketSeenAdvancements -> if (CPacketSeenAdvancementsSetting) it.cancel().also { numPackets++ } + is CPacketResourcePackStatus -> if (CPacketResourcePackStatusSetting) it.cancel().also { numPackets++ } + is CPacketRecipeInfo -> if (CPacketRecipeInfoSetting) it.cancel().also { numPackets++ } + is CPacketPlayerDigging -> if (CPacketPlayerDiggingSetting) it.cancel().also { numPackets++ } + is CPacketKeepAlive -> if (CPacketKeepAliveSetting) it.cancel().also { numPackets++ } } } listener { when (it.packet) { - is SPacketEntity.S17PacketEntityLookMove -> if (SPacketEntityS17PacketEntityLookMoveSetting) it.cancel() - is SPacketEntity.S16PacketEntityLook -> if (SPacketEntityS16PacketEntityLookSetting) it.cancel() - is SPacketEntity.S15PacketEntityRelMove -> if (SPacketEntityS15PacketEntityRelMoveSetting) it.cancel() - is SPacketServerInfo -> if (SPacketServerInfoSetting) it.cancel() - is SPacketLoginSuccess -> if (SPacketLoginSuccessSetting) it.cancel() - is SPacketWorldBorder -> if (SPacketWorldBorderSetting) it.cancel() - is SPacketWindowProperty -> if (SPacketWindowPropertySetting) it.cancel() - is SPacketWindowItems -> if (SPacketWindowItemsSetting) it.cancel() - is SPacketPong -> if (SPacketPongSetting) it.cancel() - is SPacketEncryptionRequest -> if (SPacketEncryptionRequestSetting) it.cancel() - is SPacketEnableCompression -> if (SPacketEnableCompressionSetting) it.cancel() - is SPacketDisconnect -> if (SPacketDisconnectSetting) it.cancel() - is SPacketUseBed -> if (SPacketUseBedSetting) it.cancel() - is SPacketUpdateTileEntity -> if (SPacketUpdateTileEntitySetting) it.cancel() - is SPacketUpdateScore -> if (SPacketUpdateScoreSetting) it.cancel() - is SPacketUpdateHealth -> if (SPacketUpdateHealthSetting) it.cancel() - is SPacketUpdateBossInfo -> if (SPacketUpdateBossInfoSetting) it.cancel() - is SPacketUnloadChunk -> if (SPacketUnloadChunkSetting) it.cancel() - is SPacketTitle -> if (SPacketTitleSetting) it.cancel() - is SPacketTimeUpdate -> if (SPacketTimeUpdateSetting) it.cancel() - is SPacketTeams -> if (SPacketTeamsSetting) it.cancel() - is SPacketTabComplete -> if (SPacketTabCompleteSetting) it.cancel() - is SPacketStatistics -> if (SPacketStatisticsSetting) it.cancel() - is SPacketSpawnPosition -> if (SPacketSpawnPositionSetting) it.cancel() - is SPacketSpawnPainting -> if (SPacketSpawnPaintingSetting) it.cancel() - is SPacketSpawnObject -> if (SPacketSpawnObjectSetting) it.cancel() - is SPacketSpawnPlayer -> if (SPacketSpawnPlayerSetting) it.cancel() - is SPacketSpawnMob -> if (SPacketSpawnMobSetting) it.cancel() - is SPacketSpawnGlobalEntity -> if (SPacketSpawnGlobalEntitySetting) it.cancel() - is SPacketSpawnExperienceOrb -> if (SPacketSpawnExperienceOrbSetting) it.cancel() - is SPacketSoundEffect -> if (SPacketSoundEffectSetting) it.cancel() - is SPacketSignEditorOpen -> if (SPacketSignEditorOpenSetting) it.cancel() - is SPacketSetSlot -> if (SPacketSetSlotSetting) it.cancel() - is SPacketSetExperience -> if (SPacketSetExperienceSetting) it.cancel() - is SPacketServerDifficulty -> if (SPacketServerDifficultySetting) it.cancel() - is SPacketSelectAdvancementsTab -> if (SPacketSelectAdvancementsTabSetting) it.cancel() - is SPacketScoreboardObjective -> if (SPacketScoreboardObjectiveSetting) it.cancel() - is SPacketRespawn -> if (SPacketRespawnSetting) it.cancel() - is SPacketResourcePackSend -> if (SPacketResourcePackSendSetting) it.cancel() - is SPacketRemoveEntityEffect -> if (SPacketRemoveEntityEffectSetting) it.cancel() - is SPacketRecipeBook -> if (SPacketRecipeBookSetting) it.cancel() - is SPacketPlayerListItem -> if (SPacketPlayerListItemSetting) it.cancel() - is SPacketPlayerListHeaderFooter -> if (SPacketPlayerListHeaderFooterSetting) it.cancel() - is SPacketPlayerAbilities -> if (SPacketPlayerAbilitiesSetting) it.cancel() - is SPacketPlaceGhostRecipe -> if (SPacketPlaceGhostRecipeSetting) it.cancel() - is SPacketParticles -> if (SPacketParticlesSetting) it.cancel() - is SPacketOpenWindow -> if (SPacketOpenWindowSetting) it.cancel() - is SPacketMultiBlockChange -> if (SPacketMultiBlockChangeSetting) it.cancel() - is SPacketMaps -> if (SPacketMapsSetting) it.cancel() - is SPacketKeepAlive -> if (SPacketKeepAliveSetting) it.cancel() - is SPacketJoinGame -> if (SPacketJoinGameSetting) it.cancel() - is SPacketHeldItemChange -> if (SPacketHeldItemChangeSetting) it.cancel() - is SPacketExplosion -> if (SPacketExplosionSetting) it.cancel() - is SPacketEntityVelocity -> if (SPacketEntityVelocitySetting) it.cancel() - is SPacketEntityTeleport -> if (SPacketEntityTeleportSetting) it.cancel() - is SPacketEntityStatus -> if (SPacketEntityStatusSetting) it.cancel() - is SPacketEntityProperties -> if (SPacketEntityPropertiesSetting) it.cancel() - is SPacketEntityMetadata -> if (SPacketEntityMetadataSetting) it.cancel() - is SPacketEntityHeadLook -> if (SPacketEntityHeadLookSetting) it.cancel() - is SPacketEntityEquipment -> if (SPacketEntityEquipmentSetting) it.cancel() - is SPacketEntityEffect -> if (SPacketEntityEffectSetting) it.cancel() - is SPacketEntityAttach -> if (SPacketEntityAttachSetting) it.cancel() - is SPacketEffect -> if (SPacketEffectSetting) it.cancel() - is SPacketDisplayObjective -> if (SPacketDisplayObjectiveSetting) it.cancel() - is SPacketDestroyEntities -> if (SPacketDestroyEntitiesSetting) it.cancel() - is SPacketCustomSound -> if (SPacketCustomSoundSetting) it.cancel() - is SPacketCustomPayload -> if (SPacketCustomPayloadSetting) it.cancel() - is SPacketCooldown -> if (SPacketCooldownSetting) it.cancel() - is SPacketConfirmTransaction -> if (SPacketConfirmTransactionSetting) it.cancel() - is SPacketCombatEvent -> if (SPacketCombatEventSetting) it.cancel() - is SPacketCollectItem -> if (SPacketCollectItemSetting) it.cancel() - is SPacketCloseWindow -> if (SPacketCloseWindowSetting) it.cancel() - is SPacketChunkData -> if (SPacketChunkDataSetting) it.cancel() - is SPacketChat -> if (SPacketChatSetting) it.cancel() - is SPacketChangeGameState -> if (SPacketChangeGameStateSetting) it.cancel() - is SPacketCamera -> if (SPacketCameraSetting) it.cancel() - is SPacketBlockChange -> if (SPacketBlockChangeSetting) it.cancel() - is SPacketBlockBreakAnim -> if (SPacketBlockBreakAnimSetting) it.cancel() - is SPacketBlockAction -> if (SPacketBlockActionSetting) it.cancel() - is SPacketAnimation -> if (SPacketAnimationSetting) it.cancel() - is SPacketAdvancementInfo -> if (SPacketAdvancementInfoSetting) it.cancel() + is SPacketEntity.S17PacketEntityLookMove -> if (SPacketEntityS17PacketEntityLookMoveSetting) it.cancel().also { numPackets++ } + is SPacketEntity.S16PacketEntityLook -> if (SPacketEntityS16PacketEntityLookSetting) it.cancel().also { numPackets++ } + is SPacketEntity.S15PacketEntityRelMove -> if (SPacketEntityS15PacketEntityRelMoveSetting) it.cancel().also { numPackets++ } + is SPacketServerInfo -> if (SPacketServerInfoSetting) it.cancel().also { numPackets++ } + is SPacketLoginSuccess -> if (SPacketLoginSuccessSetting) it.cancel().also { numPackets++ } + is SPacketWorldBorder -> if (SPacketWorldBorderSetting) it.cancel().also { numPackets++ } + is SPacketWindowProperty -> if (SPacketWindowPropertySetting) it.cancel().also { numPackets++ } + is SPacketWindowItems -> if (SPacketWindowItemsSetting) it.cancel().also { numPackets++ } + is SPacketPong -> if (SPacketPongSetting) it.cancel().also { numPackets++ } + is SPacketEncryptionRequest -> if (SPacketEncryptionRequestSetting) it.cancel().also { numPackets++ } + is SPacketEnableCompression -> if (SPacketEnableCompressionSetting) it.cancel().also { numPackets++ } + is SPacketDisconnect -> if (SPacketDisconnectSetting) it.cancel().also { numPackets++ } + is SPacketUseBed -> if (SPacketUseBedSetting) it.cancel().also { numPackets++ } + is SPacketUpdateTileEntity -> if (SPacketUpdateTileEntitySetting) it.cancel().also { numPackets++ } + is SPacketUpdateScore -> if (SPacketUpdateScoreSetting) it.cancel().also { numPackets++ } + is SPacketUpdateHealth -> if (SPacketUpdateHealthSetting) it.cancel().also { numPackets++ } + is SPacketUpdateBossInfo -> if (SPacketUpdateBossInfoSetting) it.cancel().also { numPackets++ } + is SPacketUnloadChunk -> if (SPacketUnloadChunkSetting) it.cancel().also { numPackets++ } + is SPacketTitle -> if (SPacketTitleSetting) it.cancel().also { numPackets++ } + is SPacketTimeUpdate -> if (SPacketTimeUpdateSetting) it.cancel().also { numPackets++ } + is SPacketTeams -> if (SPacketTeamsSetting) it.cancel().also { numPackets++ } + is SPacketTabComplete -> if (SPacketTabCompleteSetting) it.cancel().also { numPackets++ } + is SPacketStatistics -> if (SPacketStatisticsSetting) it.cancel().also { numPackets++ } + is SPacketSpawnPosition -> if (SPacketSpawnPositionSetting) it.cancel().also { numPackets++ } + is SPacketSpawnPainting -> if (SPacketSpawnPaintingSetting) it.cancel().also { numPackets++ } + is SPacketSpawnObject -> if (SPacketSpawnObjectSetting) it.cancel().also { numPackets++ } + is SPacketSpawnPlayer -> if (SPacketSpawnPlayerSetting) it.cancel().also { numPackets++ } + is SPacketSpawnMob -> if (SPacketSpawnMobSetting) it.cancel().also { numPackets++ } + is SPacketSpawnGlobalEntity -> if (SPacketSpawnGlobalEntitySetting) it.cancel().also { numPackets++ } + is SPacketSpawnExperienceOrb -> if (SPacketSpawnExperienceOrbSetting) it.cancel().also { numPackets++ } + is SPacketSoundEffect -> if (SPacketSoundEffectSetting) it.cancel().also { numPackets++ } + is SPacketSignEditorOpen -> if (SPacketSignEditorOpenSetting) it.cancel().also { numPackets++ } + is SPacketSetSlot -> if (SPacketSetSlotSetting) it.cancel().also { numPackets++ } + is SPacketSetExperience -> if (SPacketSetExperienceSetting) it.cancel().also { numPackets++ } + is SPacketServerDifficulty -> if (SPacketServerDifficultySetting) it.cancel().also { numPackets++ } + is SPacketSelectAdvancementsTab -> if (SPacketSelectAdvancementsTabSetting) it.cancel().also { numPackets++ } + is SPacketScoreboardObjective -> if (SPacketScoreboardObjectiveSetting) it.cancel().also { numPackets++ } + is SPacketRespawn -> if (SPacketRespawnSetting) it.cancel().also { numPackets++ } + is SPacketResourcePackSend -> if (SPacketResourcePackSendSetting) it.cancel().also { numPackets++ } + is SPacketRemoveEntityEffect -> if (SPacketRemoveEntityEffectSetting) it.cancel().also { numPackets++ } + is SPacketRecipeBook -> if (SPacketRecipeBookSetting) it.cancel().also { numPackets++ } + is SPacketPlayerListItem -> if (SPacketPlayerListItemSetting) it.cancel().also { numPackets++ } + is SPacketPlayerListHeaderFooter -> if (SPacketPlayerListHeaderFooterSetting) it.cancel().also { numPackets++ } + is SPacketPlayerAbilities -> if (SPacketPlayerAbilitiesSetting) it.cancel().also { numPackets++ } + is SPacketPlaceGhostRecipe -> if (SPacketPlaceGhostRecipeSetting) it.cancel().also { numPackets++ } + is SPacketParticles -> if (SPacketParticlesSetting) it.cancel().also { numPackets++ } + is SPacketOpenWindow -> if (SPacketOpenWindowSetting) it.cancel().also { numPackets++ } + is SPacketMultiBlockChange -> if (SPacketMultiBlockChangeSetting) it.cancel().also { numPackets++ } + is SPacketMaps -> if (SPacketMapsSetting) it.cancel().also { numPackets++ } + is SPacketKeepAlive -> if (SPacketKeepAliveSetting) it.cancel().also { numPackets++ } + is SPacketJoinGame -> if (SPacketJoinGameSetting) it.cancel().also { numPackets++ } + is SPacketHeldItemChange -> if (SPacketHeldItemChangeSetting) it.cancel().also { numPackets++ } + is SPacketExplosion -> if (SPacketExplosionSetting) it.cancel().also { numPackets++ } + is SPacketEntityVelocity -> if (SPacketEntityVelocitySetting) it.cancel().also { numPackets++ } + is SPacketEntityTeleport -> if (SPacketEntityTeleportSetting) it.cancel().also { numPackets++ } + is SPacketEntityStatus -> if (SPacketEntityStatusSetting) it.cancel().also { numPackets++ } + is SPacketEntityProperties -> if (SPacketEntityPropertiesSetting) it.cancel().also { numPackets++ } + is SPacketEntityMetadata -> if (SPacketEntityMetadataSetting) it.cancel().also { numPackets++ } + is SPacketEntityHeadLook -> if (SPacketEntityHeadLookSetting) it.cancel().also { numPackets++ } + is SPacketEntityEquipment -> if (SPacketEntityEquipmentSetting) it.cancel().also { numPackets++ } + is SPacketEntityEffect -> if (SPacketEntityEffectSetting) it.cancel().also { numPackets++ } + is SPacketEntityAttach -> if (SPacketEntityAttachSetting) it.cancel().also { numPackets++ }.also { numPackets++ } + is SPacketEffect -> if (SPacketEffectSetting) it.cancel().also { numPackets++ } + is SPacketDisplayObjective -> if (SPacketDisplayObjectiveSetting) it.cancel().also { numPackets++ } + is SPacketDestroyEntities -> if (SPacketDestroyEntitiesSetting) it.cancel().also { numPackets++ } + is SPacketCustomSound -> if (SPacketCustomSoundSetting) it.cancel().also { numPackets++ } + is SPacketCustomPayload -> if (SPacketCustomPayloadSetting) it.cancel().also { numPackets++ } + is SPacketCooldown -> if (SPacketCooldownSetting) it.cancel().also { numPackets++ } + is SPacketConfirmTransaction -> if (SPacketConfirmTransactionSetting) it.cancel().also { numPackets++ } + is SPacketCombatEvent -> if (SPacketCombatEventSetting) it.cancel().also { numPackets++ } + is SPacketCollectItem -> if (SPacketCollectItemSetting) it.cancel().also { numPackets++ } + is SPacketCloseWindow -> if (SPacketCloseWindowSetting) it.cancel().also { numPackets++ } + is SPacketChunkData -> if (SPacketChunkDataSetting) it.cancel().also { numPackets++ } + is SPacketChat -> if (SPacketChatSetting) it.cancel().also { numPackets++ } + is SPacketChangeGameState -> if (SPacketChangeGameStateSetting) it.cancel().also { numPackets++ } + is SPacketCamera -> if (SPacketCameraSetting) it.cancel().also { numPackets++ } + is SPacketBlockChange -> if (SPacketBlockChangeSetting) it.cancel().also { numPackets++ } + is SPacketBlockBreakAnim -> if (SPacketBlockBreakAnimSetting) it.cancel().also { numPackets++ } + is SPacketBlockAction -> if (SPacketBlockActionSetting) it.cancel().also { numPackets++ } + is SPacketAnimation -> if (SPacketAnimationSetting) it.cancel().also { numPackets++ } + is SPacketAdvancementInfo -> if (SPacketAdvancementInfoSetting) it.cancel().also { numPackets++ } } } } From b59215b56a5a7991594c6e718958ff3b63ca08a6 Mon Sep 17 00:00:00 2001 From: Constructor Date: Thu, 6 Jan 2022 19:29:46 +0100 Subject: [PATCH 5/6] Adding packet command scetch --- .../client/command/commands/PacketCommand.kt | 389 ++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt diff --git a/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt b/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt new file mode 100644 index 000000000..3f830cbcb --- /dev/null +++ b/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt @@ -0,0 +1,389 @@ +package com.lambda.client.command.commands + +import com.lambda.client.command.ClientCommand +import com.lambda.client.util.text.MessageSendHelper +import net.minecraft.inventory.ClickType +import net.minecraft.item.ItemStack +import net.minecraft.network.play.client.* +import net.minecraft.util.EnumFacing +import net.minecraft.util.EnumHand +import net.minecraft.util.math.Vec3d +import net.minecraft.util.text.TextComponentString + +object PacketCommand : ClientCommand( + name = "packet", + description = "Send any packet you want" +) { + init { + literal("Animation") { + enum("hand") { hand -> + executeSafe { + connection.sendPacket(CPacketAnimation(hand.value)) + postSend(this@literal.name,"${hand.value}") + } + } + } + + literal("ChatMessage") { + string("message") { message -> + executeSafe { + connection.sendPacket(CPacketChatMessage(message.value)) + postSend(this@literal.name, message.value) + } + } + } + + literal("ClickWindow") { + int("windowId") { windowId -> + int("slotId") { slotId -> + int("packedClickData") { packedClickData -> + enum("mode") { mode -> + short("actionNumber") { actionNumber -> + executeSafe { + // ToDo: Dynamic ItemStack + connection.sendPacket(CPacketClickWindow(windowId.value, + slotId.value, + packedClickData.value, + mode.value, + ItemStack.EMPTY, + actionNumber.value)) + postSend(this@literal.name,"${windowId.value} ${slotId.value} ${packedClickData.value} ${mode.value} ${ItemStack.EMPTY} ${actionNumber.value}") + } + } + } + } + } + } + } + + literal("ClientSettings") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("ClientStatus") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("CloseWindow") { + int("windowId") { windowId -> + executeSafe { + connection.sendPacket(CPacketCloseWindow(windowId.value)) + postSend(this@literal.name,"${windowId.value}") + } + } + } + + literal("ConfirmTeleport") { + int("teleportId") { teleportId -> + executeSafe { + connection.sendPacket(CPacketConfirmTeleport(teleportId.value)) + postSend(this@literal.name,"${teleportId.value}") + } + } + } + + literal("ConfirmTransaction") { + int("windowId") { windowId -> + short("uid") { uid -> + boolean("accepted") { accepted -> + executeSafe { + connection.sendPacket(CPacketConfirmTransaction(windowId.value, uid.value, accepted.value)) + postSend(this@literal.name,"${windowId.value} ${uid.value} ${accepted.value}") + } + } + } + } + } + + literal("CreativeInventoryAction") { + int("slotId") { slotId -> + executeSafe { + // ToDo: Dynamic ItemStack + connection.sendPacket(CPacketCreativeInventoryAction(slotId.value, ItemStack.EMPTY)) + postSend(this@literal.name,"${slotId.value} ${ItemStack.EMPTY}") + } + } + } + + literal("CustomPayload") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("EnchantItem") { + int("windowId") { windowId -> + int("button") { button -> + executeSafe { + connection.sendPacket(CPacketEnchantItem(windowId.value, button.value)) + postSend(this@literal.name,"${windowId.value} ${button.value}") + } + } + } + } + + literal("EntityAction") { + enum("action") { action -> + int("auxData") { auxData -> + executeSafe { + connection.sendPacket(CPacketEntityAction(player, action.value, auxData.value)) + postSend(this@literal.name,"${player.entityId} ${action.value} ${auxData.value}") + } + } + } + } + + literal("HeldItemChange") { + int("slotId") { slotId -> + executeSafe { + connection.sendPacket(CPacketHeldItemChange(slotId.value)) + postSend(this@literal.name,"${slotId.value}") + } + } + } + + literal("Input") { + float("strafeSpeed") { strafeSpeed -> + float("forwardSpeed") { forwardSpeed -> + boolean("jumping") { jumping -> + boolean("sneaking") { sneaking -> + executeSafe { + connection.sendPacket(CPacketInput(strafeSpeed.value, forwardSpeed.value, jumping.value, sneaking.value)) + postSend(this@literal.name,"${strafeSpeed.value} ${forwardSpeed.value} ${jumping.value} ${sneaking.value}") + } + } + } + } + } + } + + literal("KeepAlive") { + long("key") { key -> + executeSafe { + connection.sendPacket(CPacketKeepAlive(key.value)) + postSend(this@literal.name,"${key.value}") + } + } + } + + literal("PlaceRecipe") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("PlayerPosition") { + double("x") { x -> + double("y") { y -> + double("z") { z -> + boolean("onGround") { onGround -> + executeSafe { + connection.sendPacket(CPacketPlayer.Position(x.value, y.value, z.value, onGround.value)) + postSend(this@literal.name,"${x.value} ${y.value} ${z.value} ${onGround.value}") + } + } + } + } + } + } + + literal("PlayerPositionRotation") { + double("x") { x -> + double("y") { y -> + double("z") { z -> + float("yaw") { yaw -> + float("pitch") { pitch -> + boolean("onGround") { onGround -> + executeSafe { + connection.sendPacket(CPacketPlayer.PositionRotation(x.value, y.value, z.value, yaw.value, pitch.value, onGround.value)) + postSend(this@literal.name,"${x.value} ${y.value} ${z.value} ${yaw.value} ${pitch.value} ${onGround.value}") + } + } + } + } + } + } + } + } + + literal("PlayerRotation") { + float("yaw") { yaw -> + float("pitch") { pitch -> + boolean("onGround") { onGround -> + executeSafe { + connection.sendPacket(CPacketPlayer.Rotation(yaw.value, pitch.value, onGround.value)) + postSend(this@literal.name,"${yaw.value} ${pitch.value} ${onGround.value}") + } + } + } + } + } + + literal("PlayerAbilities") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("PlayerDigging") { + enum("action") { action -> + blockPos("position") { position -> + enum("facing") { facing -> + executeSafe { + connection.sendPacket(CPacketPlayerDigging(action.value, position.value, facing.value)) + postSend(this@literal.name,"${action.value} ${position.value} ${facing.value}") + } + } + } + } + } + + literal("PlayerTryUseItem") { + enum("hand") { hand -> + executeSafe { + connection.sendPacket(CPacketPlayerTryUseItem(hand.value)) + postSend(this@literal.name,"${hand.value}") + } + } + } + + literal("PlayerTryUseItemOnBlock") { + blockPos("position") { position -> + enum("placedBlockDirection") { placedBlockDirection -> + enum("hand") { hand -> + float("facingX") { facingX -> + float("facingY") { facingY -> + float("facingZ") { facingZ -> + executeSafe { + connection.sendPacket(CPacketPlayerTryUseItemOnBlock(position.value, placedBlockDirection.value, hand.value, facingX.value, facingY.value, facingZ.value)) + postSend(this@literal.name,"${position.value} ${placedBlockDirection.value} ${hand.value} ${facingX.value} ${facingY.value} ${facingZ.value}") + } + } + } + } + } + } + } + } + + literal("RecipeInfo") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("ResourcePackStatus") { + enum("action") { action -> + executeSafe { + connection.sendPacket(CPacketResourcePackStatus(action.value)) + postSend(this@literal.name,"${action.value}") + } + } + } + + literal("SeenAdvancements") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("Spectate") { + executeSafe { + MessageSendHelper.sendChatMessage("To be implemented") + } + } + + literal("SteerBoat") { + boolean("left") { left -> + boolean("right") { right -> + executeSafe { + connection.sendPacket(CPacketSteerBoat(left.value, right.value)) + postSend(this@literal.name,"${left.value} ${right.value}") + } + } + } + } + + literal("TabComplete") { + string("message") { message -> + blockPos("targetBlock") { targetBlock -> + boolean("hasTargetBlock") { hasTargetBlock -> + executeSafe { + connection.sendPacket(CPacketTabComplete(message.value, targetBlock.value, hasTargetBlock.value)) + postSend(this@literal.name,"${message.value} ${targetBlock.value} ${hasTargetBlock.value}") + } + } + } + } + } + + literal("UpdateSign") { + blockPos("position") { position -> + string("line1") { line1 -> + string("line2") { line2 -> + string("line3") { line3 -> + string("line4") { line4 -> + executeSafe { + val lines = listOf(TextComponentString(line1.value), + TextComponentString(line2.value), + TextComponentString(line3.value), + TextComponentString(line4.value)) + + connection.sendPacket(CPacketUpdateSign(position.value, lines.toTypedArray())) + postSend(this@literal.name,"${line1.value} ${line2.value} ${line3.value} ${line4.value}") + } + } + } + } + } + } + } + + literal("UseEntityAttack") { + executeSafe { + connection.sendPacket(CPacketUseEntity(player)) + postSend(this@literal.name,"${player.entityId}") + } + } + + literal("UseEntityInteract") { + enum("hand") { hand -> + executeSafe { + connection.sendPacket(CPacketUseEntity(player, hand.value)) + postSend(this@literal.name,"${player.entityId} ${hand.value}") + } + } + } + + literal("UseEntityInteractAt") { + enum("hand") { hand -> + double("x") { x -> + double("y") { y -> + double("z") { z -> + executeSafe { + val vec = Vec3d(x.value, y.value, z.value) + connection.sendPacket(CPacketUseEntity(player, hand.value, vec)) + postSend(this@literal.name,"${player.entityId} ${hand.value} $vec") + } + } + } + } + } + } + + literal("VehicleMove") { + executeSafe { + connection.sendPacket(CPacketVehicleMove(player)) + postSend(this@literal.name,"${player.entityId}") + } + } + } + + private fun postSend(literal: String, info: String) { + MessageSendHelper.sendChatMessage("Sent CPacket$literal > $info") + } +} \ No newline at end of file From 764f8c8f1f974c8ddaacacadeb3c66dc30ae0bc8 Mon Sep 17 00:00:00 2001 From: Constructor Date: Thu, 6 Jan 2022 19:29:46 +0100 Subject: [PATCH 6/6] Revert "Adding packet command scetch" This reverts commit b59215b56a5a7991594c6e718958ff3b63ca08a6. --- .../client/command/commands/PacketCommand.kt | 389 ------------------ 1 file changed, 389 deletions(-) delete mode 100644 src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt diff --git a/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt b/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt deleted file mode 100644 index 3f830cbcb..000000000 --- a/src/main/kotlin/com/lambda/client/command/commands/PacketCommand.kt +++ /dev/null @@ -1,389 +0,0 @@ -package com.lambda.client.command.commands - -import com.lambda.client.command.ClientCommand -import com.lambda.client.util.text.MessageSendHelper -import net.minecraft.inventory.ClickType -import net.minecraft.item.ItemStack -import net.minecraft.network.play.client.* -import net.minecraft.util.EnumFacing -import net.minecraft.util.EnumHand -import net.minecraft.util.math.Vec3d -import net.minecraft.util.text.TextComponentString - -object PacketCommand : ClientCommand( - name = "packet", - description = "Send any packet you want" -) { - init { - literal("Animation") { - enum("hand") { hand -> - executeSafe { - connection.sendPacket(CPacketAnimation(hand.value)) - postSend(this@literal.name,"${hand.value}") - } - } - } - - literal("ChatMessage") { - string("message") { message -> - executeSafe { - connection.sendPacket(CPacketChatMessage(message.value)) - postSend(this@literal.name, message.value) - } - } - } - - literal("ClickWindow") { - int("windowId") { windowId -> - int("slotId") { slotId -> - int("packedClickData") { packedClickData -> - enum("mode") { mode -> - short("actionNumber") { actionNumber -> - executeSafe { - // ToDo: Dynamic ItemStack - connection.sendPacket(CPacketClickWindow(windowId.value, - slotId.value, - packedClickData.value, - mode.value, - ItemStack.EMPTY, - actionNumber.value)) - postSend(this@literal.name,"${windowId.value} ${slotId.value} ${packedClickData.value} ${mode.value} ${ItemStack.EMPTY} ${actionNumber.value}") - } - } - } - } - } - } - } - - literal("ClientSettings") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("ClientStatus") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("CloseWindow") { - int("windowId") { windowId -> - executeSafe { - connection.sendPacket(CPacketCloseWindow(windowId.value)) - postSend(this@literal.name,"${windowId.value}") - } - } - } - - literal("ConfirmTeleport") { - int("teleportId") { teleportId -> - executeSafe { - connection.sendPacket(CPacketConfirmTeleport(teleportId.value)) - postSend(this@literal.name,"${teleportId.value}") - } - } - } - - literal("ConfirmTransaction") { - int("windowId") { windowId -> - short("uid") { uid -> - boolean("accepted") { accepted -> - executeSafe { - connection.sendPacket(CPacketConfirmTransaction(windowId.value, uid.value, accepted.value)) - postSend(this@literal.name,"${windowId.value} ${uid.value} ${accepted.value}") - } - } - } - } - } - - literal("CreativeInventoryAction") { - int("slotId") { slotId -> - executeSafe { - // ToDo: Dynamic ItemStack - connection.sendPacket(CPacketCreativeInventoryAction(slotId.value, ItemStack.EMPTY)) - postSend(this@literal.name,"${slotId.value} ${ItemStack.EMPTY}") - } - } - } - - literal("CustomPayload") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("EnchantItem") { - int("windowId") { windowId -> - int("button") { button -> - executeSafe { - connection.sendPacket(CPacketEnchantItem(windowId.value, button.value)) - postSend(this@literal.name,"${windowId.value} ${button.value}") - } - } - } - } - - literal("EntityAction") { - enum("action") { action -> - int("auxData") { auxData -> - executeSafe { - connection.sendPacket(CPacketEntityAction(player, action.value, auxData.value)) - postSend(this@literal.name,"${player.entityId} ${action.value} ${auxData.value}") - } - } - } - } - - literal("HeldItemChange") { - int("slotId") { slotId -> - executeSafe { - connection.sendPacket(CPacketHeldItemChange(slotId.value)) - postSend(this@literal.name,"${slotId.value}") - } - } - } - - literal("Input") { - float("strafeSpeed") { strafeSpeed -> - float("forwardSpeed") { forwardSpeed -> - boolean("jumping") { jumping -> - boolean("sneaking") { sneaking -> - executeSafe { - connection.sendPacket(CPacketInput(strafeSpeed.value, forwardSpeed.value, jumping.value, sneaking.value)) - postSend(this@literal.name,"${strafeSpeed.value} ${forwardSpeed.value} ${jumping.value} ${sneaking.value}") - } - } - } - } - } - } - - literal("KeepAlive") { - long("key") { key -> - executeSafe { - connection.sendPacket(CPacketKeepAlive(key.value)) - postSend(this@literal.name,"${key.value}") - } - } - } - - literal("PlaceRecipe") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("PlayerPosition") { - double("x") { x -> - double("y") { y -> - double("z") { z -> - boolean("onGround") { onGround -> - executeSafe { - connection.sendPacket(CPacketPlayer.Position(x.value, y.value, z.value, onGround.value)) - postSend(this@literal.name,"${x.value} ${y.value} ${z.value} ${onGround.value}") - } - } - } - } - } - } - - literal("PlayerPositionRotation") { - double("x") { x -> - double("y") { y -> - double("z") { z -> - float("yaw") { yaw -> - float("pitch") { pitch -> - boolean("onGround") { onGround -> - executeSafe { - connection.sendPacket(CPacketPlayer.PositionRotation(x.value, y.value, z.value, yaw.value, pitch.value, onGround.value)) - postSend(this@literal.name,"${x.value} ${y.value} ${z.value} ${yaw.value} ${pitch.value} ${onGround.value}") - } - } - } - } - } - } - } - } - - literal("PlayerRotation") { - float("yaw") { yaw -> - float("pitch") { pitch -> - boolean("onGround") { onGround -> - executeSafe { - connection.sendPacket(CPacketPlayer.Rotation(yaw.value, pitch.value, onGround.value)) - postSend(this@literal.name,"${yaw.value} ${pitch.value} ${onGround.value}") - } - } - } - } - } - - literal("PlayerAbilities") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("PlayerDigging") { - enum("action") { action -> - blockPos("position") { position -> - enum("facing") { facing -> - executeSafe { - connection.sendPacket(CPacketPlayerDigging(action.value, position.value, facing.value)) - postSend(this@literal.name,"${action.value} ${position.value} ${facing.value}") - } - } - } - } - } - - literal("PlayerTryUseItem") { - enum("hand") { hand -> - executeSafe { - connection.sendPacket(CPacketPlayerTryUseItem(hand.value)) - postSend(this@literal.name,"${hand.value}") - } - } - } - - literal("PlayerTryUseItemOnBlock") { - blockPos("position") { position -> - enum("placedBlockDirection") { placedBlockDirection -> - enum("hand") { hand -> - float("facingX") { facingX -> - float("facingY") { facingY -> - float("facingZ") { facingZ -> - executeSafe { - connection.sendPacket(CPacketPlayerTryUseItemOnBlock(position.value, placedBlockDirection.value, hand.value, facingX.value, facingY.value, facingZ.value)) - postSend(this@literal.name,"${position.value} ${placedBlockDirection.value} ${hand.value} ${facingX.value} ${facingY.value} ${facingZ.value}") - } - } - } - } - } - } - } - } - - literal("RecipeInfo") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("ResourcePackStatus") { - enum("action") { action -> - executeSafe { - connection.sendPacket(CPacketResourcePackStatus(action.value)) - postSend(this@literal.name,"${action.value}") - } - } - } - - literal("SeenAdvancements") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("Spectate") { - executeSafe { - MessageSendHelper.sendChatMessage("To be implemented") - } - } - - literal("SteerBoat") { - boolean("left") { left -> - boolean("right") { right -> - executeSafe { - connection.sendPacket(CPacketSteerBoat(left.value, right.value)) - postSend(this@literal.name,"${left.value} ${right.value}") - } - } - } - } - - literal("TabComplete") { - string("message") { message -> - blockPos("targetBlock") { targetBlock -> - boolean("hasTargetBlock") { hasTargetBlock -> - executeSafe { - connection.sendPacket(CPacketTabComplete(message.value, targetBlock.value, hasTargetBlock.value)) - postSend(this@literal.name,"${message.value} ${targetBlock.value} ${hasTargetBlock.value}") - } - } - } - } - } - - literal("UpdateSign") { - blockPos("position") { position -> - string("line1") { line1 -> - string("line2") { line2 -> - string("line3") { line3 -> - string("line4") { line4 -> - executeSafe { - val lines = listOf(TextComponentString(line1.value), - TextComponentString(line2.value), - TextComponentString(line3.value), - TextComponentString(line4.value)) - - connection.sendPacket(CPacketUpdateSign(position.value, lines.toTypedArray())) - postSend(this@literal.name,"${line1.value} ${line2.value} ${line3.value} ${line4.value}") - } - } - } - } - } - } - } - - literal("UseEntityAttack") { - executeSafe { - connection.sendPacket(CPacketUseEntity(player)) - postSend(this@literal.name,"${player.entityId}") - } - } - - literal("UseEntityInteract") { - enum("hand") { hand -> - executeSafe { - connection.sendPacket(CPacketUseEntity(player, hand.value)) - postSend(this@literal.name,"${player.entityId} ${hand.value}") - } - } - } - - literal("UseEntityInteractAt") { - enum("hand") { hand -> - double("x") { x -> - double("y") { y -> - double("z") { z -> - executeSafe { - val vec = Vec3d(x.value, y.value, z.value) - connection.sendPacket(CPacketUseEntity(player, hand.value, vec)) - postSend(this@literal.name,"${player.entityId} ${hand.value} $vec") - } - } - } - } - } - } - - literal("VehicleMove") { - executeSafe { - connection.sendPacket(CPacketVehicleMove(player)) - postSend(this@literal.name,"${player.entityId}") - } - } - } - - private fun postSend(literal: String, info: String) { - MessageSendHelper.sendChatMessage("Sent CPacket$literal > $info") - } -} \ No newline at end of file