diff options
| author | Spencer <75862693+TacoMonkey11@users.noreply.github.com> | 2022-04-12 08:09:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 08:09:15 -0400 |
| commit | 1cdaa3cd24cef1f021237a8e0d3748faa75c7cfe (patch) | |
| tree | b153c0377a9be09bf69792fbb93cfd2da66c0046 /src/main/java/me/xmrvizzy/skyblocker/mixin | |
| parent | 1971d74529540a230acff05bc87c82997462da67 (diff) | |
| parent | 481ea9be68c316ff362c64457f72968ec72120d5 (diff) | |
| download | Skyblocker-1cdaa3cd24cef1f021237a8e0d3748faa75c7cfe.tar.gz Skyblocker-1cdaa3cd24cef1f021237a8e0d3748faa75c7cfe.tar.bz2 Skyblocker-1cdaa3cd24cef1f021237a8e0d3748faa75c7cfe.zip | |
Merge branch 'SkyblockerMod:master' into fabricapi-events
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 6 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index b1bb0d93..bd99f2d4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -47,8 +47,10 @@ public abstract class HandledScreenMixin extends Screen { @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.inventoryKey.matchesKey(keyCode, scanCode)){ - if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); + if (focusedSlot != null){ + if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){ + if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); + } } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index 19e0d79e..b9e80bd6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -24,6 +24,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + @Environment(EnvType.CLIENT) @Mixin(InGameHud.class) public abstract class InGameHudMixin extends DrawableHelper { |