Skip to content

Commit 09b11ce

Browse files
committed
Prefix AbstractRecipeBookScreenAccessor to avoid Controlify conflict
Fixes gh-90
1 parent e827730 commit 09b11ce

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

common/src/main/java/me/pieking1215/invmove/mixin/client/AbstractRecipeBookScreenAccessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
@Mixin(AbstractRecipeBookScreen.class)
1111
public interface AbstractRecipeBookScreenAccessor {
12-
@Accessor
13-
RecipeBookComponent<?> getRecipeBookComponent();
12+
@Accessor("recipeBookComponent")
13+
RecipeBookComponent<?> invmove$getRecipeBookComponent();
1414
}
1515

1616
//?}

common/src/main/java/me/pieking1215/invmove/module/VanillaModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public Movement shouldAllowMovement(Screen screen) {
100100
/*if (screen instanceof RecipeUpdateListener) {*/
101101
try {
102102
//? if >=1.21.2 {
103-
RecipeBookComponent<?> cmp = ((AbstractRecipeBookScreenAccessor) screen).getRecipeBookComponent();
103+
RecipeBookComponent<?> cmp = ((AbstractRecipeBookScreenAccessor) screen).invmove$getRecipeBookComponent();
104104
//?} else
105105
/*RecipeBookComponent cmp = ((RecipeUpdateListener) screen).getRecipeBookComponent();*/
106106
if (cmp.isVisible())
@@ -136,7 +136,7 @@ public Movement shouldAllowMovement(Screen screen) {
136136
/*if (screen instanceof RecipeUpdateListener) {*/
137137
try {
138138
//? if >=1.21.2 {
139-
RecipeBookComponent<?> cmp = ((AbstractRecipeBookScreenAccessor) screen).getRecipeBookComponent();
139+
RecipeBookComponent<?> cmp = ((AbstractRecipeBookScreenAccessor) screen).invmove$getRecipeBookComponent();
140140
//?} else
141141
/*RecipeBookComponent cmp = ((RecipeUpdateListener) screen).getRecipeBookComponent();*/
142142
EditBox searchBar = ((RecipeBookComponentAccessor)cmp).getSearchBox();

0 commit comments

Comments
 (0)