Skip to content

fix(mixin): conditionally apply Baritone mixins #6677

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
Big-Iron-Cheems wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −0
Open

fix(mixin): conditionally apply Baritone mixins #6677

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
4 changes: 4 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/MixinPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class MixinPlugin implements IMixinConfigPlugin {
private static boolean isLithiumPresent;
public static boolean isIrisPresent;
private static boolean isVFPPresent;
private static boolean isBaritonePresent;

@Override
public void onLoad(String mixinPackage) {
Expand All @@ -35,6 +36,7 @@ public void onLoad(String mixinPackage) {
isLithiumPresent = FabricLoader.getInstance().isModLoaded("lithium");
isIrisPresent = FabricLoader.getInstance().isModLoaded("iris");
isVFPPresent = FabricLoader.getInstance().isModLoaded("viafabricplus");
isBaritonePresent = FabricLoader.getInstance().isModLoaded("baritone") || FabricLoader.getInstance().isModLoaded("baritone-meteor");

loaded = true;
}
Expand All @@ -58,6 +60,8 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
return isLithiumPresent;
} else if (mixinClassName.startsWith(mixinPackage + ".viafabricplus")) {
return isVFPPresent;
} else if (mixinClassName.startsWith(mixinPackage + ".baritone")) {
return isBaritonePresent;
}


Expand Down
Loading