Skip to content

Commit fbd8055

Browse files
committed
Add animatium prefix to recipeBookComponent getter
Other mods such as Controllerify use this name, which can end up clashing and cause crashes.
1 parent ebfa68b commit fbd8055

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/btw/mixces/animatium/mixins/accessor/AbstractRecipeBookScreenAccessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030

3131
@Mixin(AbstractRecipeBookScreen.class)
3232
public interface AbstractRecipeBookScreenAccessor {
33-
@Accessor
34-
RecipeBookComponent<?> getRecipeBookComponent();
33+
@Accessor("recipeBookComponent")
34+
RecipeBookComponent<?> animatium$getRecipeBookComponent();
3535
}

src/main/java/btw/mixces/animatium/mixins/screen/inventory/MixinEffectsInInventory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public abstract class MixinEffectsInInventory {
4646
@WrapOperation(method = "renderEffects", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;imageWidth:I"))
4747
private int animatium$effectsInventoryPosition(AbstractContainerScreen<?> instance, Operation<Integer> original) {
4848
final int imageWidth = original.call(instance);
49-
if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().effectsInventoryPosition && !(this.screen instanceof AbstractRecipeBookScreen<?> recipeBookScreen && ((AbstractRecipeBookScreenAccessor) recipeBookScreen).getRecipeBookComponent().isVisible())) {
49+
if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().effectsInventoryPosition && !(this.screen instanceof AbstractRecipeBookScreen<?> recipeBookScreen && ((AbstractRecipeBookScreenAccessor) recipeBookScreen).animatium$getRecipeBookComponent().isVisible())) {
5050
return 0;
5151
} else {
5252
return imageWidth;
@@ -55,7 +55,7 @@ public abstract class MixinEffectsInInventory {
5555

5656
@ModifyExpressionValue(method = "renderEffects", at = @At(value = "CONSTANT", args = "intValue=2"))
5757
private int animatium$effectsInventoryPosition(int original) {
58-
if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().effectsInventoryPosition && !(this.screen instanceof AbstractRecipeBookScreen<?> recipeBookScreen && ((AbstractRecipeBookScreenAccessor) recipeBookScreen).getRecipeBookComponent().isVisible())) {
58+
if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().effectsInventoryPosition && !(this.screen instanceof AbstractRecipeBookScreen<?> recipeBookScreen && ((AbstractRecipeBookScreenAccessor) recipeBookScreen).animatium$getRecipeBookComponent().isVisible())) {
5959
return -124;
6060
} else {
6161
return original;

0 commit comments

Comments
 (0)