diff options
author | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-28 15:35:05 -0500 |
---|---|---|
committer | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-28 15:35:05 -0500 |
commit | 8b5e1e46efe78cedaa4ccfa488b28f6a43b8aa1b (patch) | |
tree | 388c83434f4d391258933ef648c3f98a765187c9 /src/main/java/me/xmrvizzy/skyblocker/mixin | |
parent | 50ad421301d993ba4a8921f0f7c4ed1a009ed318 (diff) | |
download | Skyblocker-8b5e1e46efe78cedaa4ccfa488b28f6a43b8aa1b.tar.gz Skyblocker-8b5e1e46efe78cedaa4ccfa488b28f6a43b8aa1b.tar.bz2 Skyblocker-8b5e1e46efe78cedaa4ccfa488b28f6a43b8aa1b.zip |
Made wiki lookup work for inventory slots
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')
-rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index 0ed976f3..20d327ff 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -1,21 +1,29 @@ package me.xmrvizzy.skyblocker.mixin; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup; import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemListWidget; 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.HandledScreen; +import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(HandledScreen.class) public abstract class HandledScreenMixin extends Screen { protected HandledScreenMixin(Text title) { super(title); } + @Shadow + @Nullable protected Slot focusedSlot; @Inject(method = "init()V", at = @At("TAIL")) private void init(CallbackInfo ci) { @@ -23,4 +31,11 @@ public abstract class HandledScreenMixin extends Screen { super.addDrawableChild(new ItemListWidget((HandledScreen)(Object)this)); } } + + @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true) + public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) { + if (keyCode != 256 && !MinecraftClient.getInstance().options.keyInventory.matchesKey(keyCode, scanCode)){ + if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); + } + } } |