Merge pull request #19 from ExternalTime/terminal-solvers

Added terminal solvers

1 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java
index 5ef5b0b4..21730e69 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java
@@ -1,9 +1,12 @@
 package me.xmrvizzy.skyblocker.mixin;
 
 import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.container.ContainerSolverManager;
 import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.client.network.ClientPlayerEntity;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -19,11 +22,20 @@ public class MinecraftClientMixin {
 
     @Inject(method = "tick", at = @At("HEAD"))
     public void tick(CallbackInfo ci) {
-        SkyblockerMod.onTick();
+        SkyblockerMod.getInstance().onTick();
     }
 
     @Inject(method = "handleInputEvents", at = @At("HEAD"))
     public void handleInputEvents(CallbackInfo ci) {
         if (Utils.isSkyblock) HotbarSlotLock.handleInputEvents(player);
     }
+
+    @Inject(method = "setScreen", at = @At("HEAD"))
+    public void onSetScreen(Screen screen, CallbackInfo ci) {
+        ContainerSolverManager manager = SkyblockerMod.getInstance().containerSolverManager;
+        if(Utils.isSkyblock && screen instanceof GenericContainerScreen)
+            manager.onSetScreen((GenericContainerScreen) screen);
+        else
+            manager.clearScreen();
+    }
 }
\ No newline at end of file