Skip to content

Fix AbstractContainerScreenMixin crashing on NeoForge #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThatPreston wants to merge 1 commit into
base: 1.21.5
Choose a base branch
from
Open

Fix AbstractContainerScreenMixin crashing on NeoForge #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...on/src/main/java/io/wispforest/accessories/mixin/client/AbstractContainerScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,4 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt

original.call(instance, function, texture, x, y, width, height);
}

@WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;matches(II)Z"))
private boolean accessories$adjustCloseCheck(KeyMapping instance, int keysym, int scancode, Operation<Boolean> original) {
return original.call(instance, keysym, scancode) || original.call(AccessoriesClient.OPEN_SCREEN, keysym, scancode);
}
}
7 changes: 7 additions & 0 deletions ...main/java/io/wispforest/accessories/fabric/mixin/client/AbstractContainerScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import io.wispforest.accessories.client.AccessoriesClient;
import io.wispforest.accessories.pond.ContainerScreenExtension;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.inventory.Slot;
Expand All @@ -30,4 +32,9 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt

if (override == null || override) original.call(instance, guiGraphics);
}

@WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;matches(II)Z", ordinal = 0))
private boolean accessories$adjustCloseCheck(KeyMapping instance, int keysym, int scancode, Operation<Boolean> original) {
return original.call(instance, keysym, scancode) || original.call(AccessoriesClient.OPEN_SCREEN, keysym, scancode);
}
}
8 changes: 8 additions & 0 deletions ...in/java/io/wispforest/accessories/neoforge/mixin/client/AbstractContainerScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import com.mojang.blaze3d.platform.InputConstants;
import io.wispforest.accessories.client.AccessoriesClient;
import io.wispforest.accessories.pond.ContainerScreenExtension;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.inventory.Slot;
Expand Down Expand Up @@ -32,4 +35,9 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt

if (override == null || override) original.call(instance, guiGraphics);
}

@WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;isActiveAndMatches(Lcom/mojang/blaze3d/platform/InputConstants$Key;)Z", ordinal = 0))
private boolean accessories$adjustCloseCheck(KeyMapping instance, InputConstants.Key mouseKey, Operation<Boolean> original) {
return original.call(instance, mouseKey) || original.call(AccessoriesClient.OPEN_SCREEN, mouseKey);
}
}