Skip to content
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

Reimplement dev ModDiscovererMixin in more lightweight way #14

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

Reimplement dev ModDiscovererMixin in more lightweight way #14

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
29 changes: 6 additions & 23 deletions src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/ModDiscovererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import org.spongepowered.asm.mixin.injection.ModifyVariable;

import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.ModClassLoader;
import cpw.mods.fml.common.discovery.ContainerType;
import cpw.mods.fml.common.discovery.ModCandidate;
import cpw.mods.fml.common.discovery.ModDiscoverer;

import java.io.File;
import java.util.Arrays;
import java.util.List;

@Mixin(value = ModDiscoverer.class,
Expand All @@ -28,21 +22,10 @@ public List<ModCandidate> getCandidates() {
return candidates;
}

@Inject(method = "findClasspathMods",
at = @At(value = "INVOKE",
target = "Lcpw/mods/fml/common/FMLLog;finer(Ljava/lang/String;[Ljava/lang/Object;)V"),
locals = LocalCapture.CAPTURE_FAILHARD,
@ModifyVariable(method = "findClasspathMods",
at = @At("STORE"),
require = 1)
private void smartCheck(ModClassLoader modClassLoader, CallbackInfo ci, List<String> knownLibraries, File[] minecraftSources, int i) {
FMLLog.fine("Found a minecraft related file at %s, examining for mod candidates", minecraftSources[i].getAbsolutePath());
candidates.add(new ModCandidate(minecraftSources[i], minecraftSources[i], ContainerType.JAR, i == 0, true));
}

@Redirect(method = "findClasspathMods",
at = @At(value = "INVOKE",
target = "Lcpw/mods/fml/common/FMLLog;finer(Ljava/lang/String;[Ljava/lang/Object;)V"),
require = 1)
private void noLog(String format, Object[] data) {

private List<String> noKnownLibraries(List<String> original) {
return Arrays.asList();
}
}