Synchronized inventory transactions (#308)

* First sketch

* Getting somewhere

- Timeout missing
- Retry function missing
- Impl for Operation.kt missing

* Refined (timeout still not working fully)

* Fixed timeout, pause baritone process and pause on lag

* Add compatibility with Operation.kt

* Add isDone

* Fix build

* Add debug option

* Feature to pause modules internally

* Propagate request owner module to sync transactions

* Cleanup residue

* Refactor

* Even more refactor

* Refactor AutoTool

* Unpause modules on failure

* Fix delays for old method of moving items

Author: Avanatiker

src/main/java/com/lambda/mixin/MixinMinecraft.java

@@ -5,11 +5,11 @@
 import com.lambda.client.event.events.RunGameLoopEvent;
 import com.lambda.client.gui.hudgui.elements.misc.FPS;
 import com.lambda.client.manager.managers.HotbarManager;
-import com.lambda.mixin.accessor.player.AccessorEntityPlayerSP;
-import com.lambda.mixin.accessor.player.AccessorPlayerControllerMP;
 import com.lambda.client.module.modules.combat.CrystalAura;
 import com.lambda.client.module.modules.player.BlockInteraction;
 import com.lambda.client.util.Wrapper;
+import com.lambda.mixin.accessor.player.AccessorEntityPlayerSP;
+import com.lambda.mixin.accessor.player.AccessorPlayerControllerMP;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiScreen;
@@ -130,14 +130,14 @@ public void processKeyBindsInvokeIsKeyDown(CallbackInfo ci) {
     public void rightClickMousePre(CallbackInfo ci) {
         if (BlockInteraction.isMultiTaskEnabled()) {
             isHittingBlock = playerController.getIsHittingBlock();
-            ((AccessorPlayerControllerMP) playerController).kbSetIsHittingBlock(false);
+            ((AccessorPlayerControllerMP) playerController).setIsHittingBlockFun(false);
         }
     }
 
     @Inject(method = "rightClickMouse", at = @At("RETURN"))
     public void rightClickMousePost(CallbackInfo ci) {
         if (BlockInteraction.isMultiTaskEnabled() && !playerController.getIsHittingBlock()) {
-            ((AccessorPlayerControllerMP) playerController).kbSetIsHittingBlock(isHittingBlock);
+            ((AccessorPlayerControllerMP) playerController).setIsHittingBlockFun(isHittingBlock);
         }
     }
 

src/main/java/com/lambda/mixin/accessor/player/AccessorPlayerControllerMP.java

@@ -15,12 +15,11 @@ public interface AccessorPlayerControllerMP {
     void setBlockHitDelay(int value);
 
     @Accessor("isHittingBlock")
-    void kbSetIsHittingBlock(boolean value);
+    void setIsHittingBlockFun(boolean value);
 
     @Accessor("currentPlayerItem")
     int getCurrentPlayerItem();
 
     @Invoker("syncCurrentPlayItem")
-    void kb_invokeSyncCurrentPlayItem(); // Mixin bug #430 https://github.com/SpongePowered/Mixin/issues/430
-
+    void synchronizeCurrentPlayItem(); // Mixin bug #430 https://github.com/SpongePowered/Mixin/issues/430
 }

src/main/java/com/lambda/mixin/player/MixinPlayerControllerMP.java

@@ -2,8 +2,8 @@
 
 import com.lambda.client.event.LambdaEventBus;
 import com.lambda.client.event.events.PlayerAttackEvent;
+import com.lambda.client.event.events.WindowClickEvent;
 import com.lambda.client.module.modules.player.AutoEat;
-import com.lambda.client.module.modules.player.NoGhostItems;
 import com.lambda.client.module.modules.player.TpsSync;
 import com.lambda.client.util.TpsCalculator;
 import net.minecraft.block.state.IBlockState;
@@ -14,6 +14,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,7 +26,7 @@
 public class MixinPlayerControllerMP {
 
     @Redirect(method = "onPlayerDamageBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/state/IBlockState;getPlayerRelativeBlockHardness(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)F"))
-    float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
+    float getPlayerRelativeBlockHardness(@NotNull IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
         return state.getPlayerRelativeBlockHardness(player, worldIn, pos) * (TpsSync.INSTANCE.isEnabled() ? (TpsCalculator.INSTANCE.getTickRate() / 20f) : 1);
     }
 
@@ -41,8 +42,9 @@ public void attackEntity(EntityPlayer playerIn, Entity targetEntity, CallbackInf
 
     @Inject(method = "windowClick", at = @At("HEAD"), cancellable = true)
     public void onWindowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player, CallbackInfoReturnable<ItemStack> cir) {
-        if (NoGhostItems.INSTANCE.isEnabled()) {
-            NoGhostItems.INSTANCE.handleWindowClick(windowId, slotId, mouseButton, type, player);
+        WindowClickEvent event = new WindowClickEvent(windowId, slotId, mouseButton, type);
+        LambdaEventBus.INSTANCE.post(event);
+        if (event.getCancelled()) {
             cir.cancel();
         }
     }

src/main/java/com/lambda/mixin/world/MixinGetCollisionBB.java

@@ -33,5 +33,8 @@ private void getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldI
             }
         }
     }
-    public Block getBlock(BlockPos var0) {return mc.world.getBlockState(var0).getBlock();}
+
+    public Block getBlock(BlockPos var0) {
+        return mc.world.getBlockState(var0).getBlock();
+    }
 }

src/main/java/com/lambda/mixin/world/MixinItemBlock.java

@@ -1,6 +1,6 @@
 package com.lambda.mixin.world;
 
-import com.lambda.client.module.modules.player.NoGlitchBlocks;
+import com.lambda.client.module.modules.player.NoGhostBlocks;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.math.BlockPos;
@@ -13,7 +13,7 @@
 public class MixinItemBlock {
     @Redirect(method = "placeBlockAt", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z"))
     private boolean ignoreSetBlockState(World instance, BlockPos p_setBlockState_1_, IBlockState p_setBlockState_2_, int p_setBlockState_3_) {
-        if (NoGlitchBlocks.INSTANCE.isEnabled()) {
+        if (NoGhostBlocks.INSTANCE.isEnabled()) {
             return true;
         } else {
             return instance.setBlockState(p_setBlockState_1_, p_setBlockState_2_, p_setBlockState_3_);

src/main/kotlin/com/lambda/client/command/Args.kt

@@ -1,17 +1,17 @@
 package com.lambda.client.command
 
 import com.lambda.client.capeapi.PlayerProfile
+import com.lambda.client.command.args.AbstractArg
+import com.lambda.client.command.args.AutoComplete
+import com.lambda.client.command.args.DynamicPrefixMatch
+import com.lambda.client.command.args.StaticPrefixMatch
 import com.lambda.client.gui.GuiManager
 import com.lambda.client.gui.hudgui.AbstractHudElement
 import com.lambda.client.manager.managers.UUIDManager
 import com.lambda.client.module.AbstractModule
 import com.lambda.client.module.ModuleManager
 import com.lambda.client.util.*
 import com.lambda.client.util.threads.runSafeR
-import com.lambda.client.command.args.AbstractArg
-import com.lambda.client.command.args.AutoComplete
-import com.lambda.client.command.args.DynamicPrefixMatch
-import com.lambda.client.command.args.StaticPrefixMatch
 import kotlinx.coroutines.Dispatchers
 import net.minecraft.block.Block
 import net.minecraft.item.Item

src/main/kotlin/com/lambda/client/command/commands/ConfigCommand.kt

@@ -1,6 +1,7 @@
 package com.lambda.client.command.commands
 
 import com.lambda.client.command.ClientCommand
+import com.lambda.client.command.execute.IExecuteEvent
 import com.lambda.client.event.SafeExecuteEvent
 import com.lambda.client.module.modules.client.Configurations
 import com.lambda.client.util.ConfigUtils
@@ -9,7 +10,6 @@ import com.lambda.client.util.TimeUnit
 import com.lambda.client.util.text.MessageSendHelper
 import com.lambda.client.util.text.formatValue
 import com.lambda.client.util.threads.defaultScope
-import com.lambda.client.command.execute.IExecuteEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

src/main/kotlin/com/lambda/client/command/commands/CreditsCommand.kt

@@ -4,9 +4,9 @@ import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
 import com.lambda.client.LambdaMod
 import com.lambda.client.command.ClientCommand
+import com.lambda.client.commons.utils.ConnectionUtils
 import com.lambda.client.util.text.MessageSendHelper
 import com.lambda.client.util.text.formatValue
-import com.lambda.client.commons.utils.ConnectionUtils
 
 object CreditsCommand : ClientCommand(
     name = "credits",

src/main/kotlin/com/lambda/client/command/commands/EntityStatsCommand.kt

@@ -1,9 +1,9 @@
 package com.lambda.client.command.commands
 
 import com.lambda.client.command.ClientCommand
+import com.lambda.client.commons.utils.MathUtils
 import com.lambda.client.manager.managers.UUIDManager
 import com.lambda.client.util.text.MessageSendHelper
-import com.lambda.client.commons.utils.MathUtils
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.passive.AbstractHorse
 import kotlin.math.pow

src/main/kotlin/com/lambda/client/command/commands/NBTCommand.kt

@@ -1,10 +1,10 @@
 package com.lambda.client.command.commands
 
 import com.lambda.client.command.ClientCommand
+import com.lambda.client.commons.utils.SystemUtils
 import com.lambda.client.event.SafeExecuteEvent
 import com.lambda.client.util.text.MessageSendHelper
 import com.lambda.client.util.text.formatValue
-import com.lambda.client.commons.utils.SystemUtils
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.JsonToNBT
 import net.minecraft.nbt.NBTTagCompound