Skip to content

Commit

Permalink
[LEGACY] Replaced old inventory management modules (CCBlueX#1432)
Browse files Browse the repository at this point in the history
* Inventory rework fixes and improvements

Fixed ArmorComparator incorrectly marking equipped armor as better incorrectly.
(reported by @guosic)

Fixed Armorer equipping armor from chests even when hotbar equipping was disabled, simplified code.

Cleaner:
* added MaxThrowableStacks
* now preferably sorts strictly the best items into hotbar
* now keeps only 1 bucket of each type max

Stealer:
* max stacks limit now checks, if the item that should be stolen won't merge with stacks in inventory, if so, it ignores stack limits, previously it wouldn't take it
(reported by @guosic)

Added InventoryUtils.countSpaceInInventory()

* [LEGACY] Replaced old inventory management modules

CoroutineStealer -> ChestStealer
CoroutineCleaner -> InventoryCleaner
CoroutineArmorer -> AutoArmor
CoroutineArmorComparator -> ArmorComparator

Added missing headers.
  • Loading branch information
CzechHek authored Oct 19, 2023
1 parent ac2c852 commit 27727ce
Show file tree
Hide file tree
Showing 28 changed files with 1,009 additions and 1,923 deletions.
5 changes: 5 additions & 0 deletions src/main/java/net/ccbluex/liquidbounce/api/ClientApi.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* LiquidBounce Hacked Client
* A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge.
* https://github.com/CCBlueX/LiquidBounce/
*/
package net.ccbluex.liquidbounce.api

import com.google.gson.annotations.SerializedName
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/net/ccbluex/liquidbounce/api/ClientSettings.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* LiquidBounce Hacked Client
* A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge.
* https://github.com/CCBlueX/LiquidBounce/
*/
package net.ccbluex.liquidbounce.api

import net.ccbluex.liquidbounce.utils.ClientUtils.LOGGER
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/net/ccbluex/liquidbounce/api/MessageOfTheDay.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* LiquidBounce Hacked Client
* A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge.
* https://github.com/CCBlueX/LiquidBounce/
*/
package net.ccbluex.liquidbounce.api

import net.ccbluex.liquidbounce.api.ClientApi.requestMessageOfTheDayEndpoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ import net.ccbluex.liquidbounce.event.EventTarget
import net.ccbluex.liquidbounce.event.KeyEvent
import net.ccbluex.liquidbounce.event.Listenable
import net.ccbluex.liquidbounce.features.command.CommandManager.registerCommand
import net.ccbluex.liquidbounce.features.module.modules.beta.CoroutineArmorer
import net.ccbluex.liquidbounce.features.module.modules.beta.CoroutineCleaner
import net.ccbluex.liquidbounce.features.module.modules.beta.CoroutineStealer
import net.ccbluex.liquidbounce.features.module.modules.combat.*
import net.ccbluex.liquidbounce.features.module.modules.exploit.*
import net.ccbluex.liquidbounce.features.module.modules.`fun`.Derp
Expand All @@ -28,7 +25,6 @@ import net.ccbluex.liquidbounce.utils.ClientUtils.LOGGER
import net.ccbluex.liquidbounce.utils.inventory.InventoryManager
import java.util.*


object ModuleManager : Listenable {

val modules = TreeSet<Module> { module1, module2 -> module1.name.compareTo(module2.name) }
Expand All @@ -46,7 +42,6 @@ object ModuleManager : Listenable {

// Register modules which need to be instanced (Java classes)
registerModules(
AutoArmor::class.java,
Ignite::class.java,
ItemTeleport::class.java,
Phase::class.java,
Expand All @@ -71,6 +66,7 @@ object ModuleManager : Listenable {
AtAllProvider,
AttackEffects,
AutoAccount,
AutoArmor,
AutoBow,
AutoBreak,
AutoClicker,
Expand Down Expand Up @@ -103,9 +99,6 @@ object ModuleManager : Listenable {
Clip,
ComponentOnHover,
ConsoleSpammer,
CoroutineArmorer,
CoroutineCleaner,
CoroutineStealer,
Criticals,
Damage,
Derp,
Expand Down
Loading

0 comments on commit 27727ce

Please sign in to comment.