Skip to content

Prevent crash by switching to @ModifyExpressionValue in Mixin #374

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
FitchWorks wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent crash by switching to @ModifyExpressionValue in Mixin #374

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
10 changes: 5 additions & 5 deletions src/main/java/dev/isxander/yacl3/mixin/ContainerEventHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.isxander.yacl3.mixin;

import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.gui.components.events.ContainerEventHandler;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -11,7 +12,6 @@
import net.minecraft.client.gui.navigation.ScreenRectangle;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;

import java.util.List;

Expand All @@ -21,16 +21,16 @@ public interface ContainerEventHandlerMixin {
// through the YACL options screen. This can also apply to vanilla as navigating left or right
// should never result in focusing the always-at-the-top tab bar.
// Without this, navigating right from the option list focuses the tab bar, not the action buttons/description.
@Redirect(
@ModifyExpressionValue(
method = {"nextFocusPathVaguelyInDirection", "nextFocusPathInDirection"},
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/components/events/ContainerEventHandler;children()Ljava/util/List;"
)
)
default List<?> modifyFocusCandidates(ContainerEventHandler instance, @Local(argsOnly = true) ScreenDirection direction) {
default List<?> modifyFocusCandidates(List<?> original, @Local(argsOnly = true) ScreenDirection direction) {
if (direction.getAxis() == ScreenAxis.HORIZONTAL)
return instance.children().stream().filter(child -> !(child instanceof TabNavigationBar)).toList();
return instance.children();
return original.stream().filter(child -> !(child instanceof TabNavigationBar)).toList();
return original;
}
}