Skip to content

Commit

Permalink
Removed loadMixins(Class), added loadMixins(String package)
Browse files Browse the repository at this point in the history
  • Loading branch information
LunNova committed Feb 4, 2016
1 parent a250f59 commit d04433f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

repositories {
mavenCentral()
jcenter()
maven { url 'http://repo.nallar.me/' }
}

Expand Down
13 changes: 7 additions & 6 deletions src/main/java/me/nallar/modpatcher/ModPatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,14 @@ public static Patcher getPatcher() {
}

/**
* Loads mixins from the package which the given class is in
* Loads mixins from the given package.
* The package must have a package-info.java with @Mixin annotation
*
* @param mixinClass Class to load mixins from package of
* @param mixinPackage Package to load mixins from
*/
public static void loadMixins(Class<?> mixinClass) {
public static void loadMixins(String mixinPackage) {
checkClassLoading();
ModPatcherTransformer.loadMixins(mixinClass);
ModPatcherTransformer.getMixinApplicator().addSource(mixinPackage);
}

/**
Expand All @@ -107,7 +108,7 @@ public static void loadMixins(Class<?> mixinClass) {
*/
public static void loadMixins(Path path) {
checkClassLoading();
ModPatcherTransformer.loadMixins(path);
ModPatcherTransformer.getMixinApplicator().addSource(path);
}

/**
Expand All @@ -117,7 +118,7 @@ public static void loadMixins(Path path) {
*/
public static void loadMixins(Path path, String packageName) {
checkClassLoading();
ModPatcherTransformer.loadMixins(path, packageName);
ModPatcherTransformer.getMixinApplicator().addSource(path, packageName);
}

/**
Expand Down
14 changes: 1 addition & 13 deletions src/main/java/me/nallar/modpatcher/ModPatcherTransformer.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,7 @@ static String getDefaultPatchesDirectory() {
return MOD_PATCHES_DIRECTORY;
}

public static void loadMixins(Class<?> mixinClass) {
getMixinApplicator().addSource(mixinClass);
}

public static void loadMixins(Path path, String packageName) {
getMixinApplicator().addSource(path, packageName);
}

public static void loadMixins(Path path) {
getMixinApplicator().addSource(path);
}

private static MixinApplicator getMixinApplicator() {
static MixinApplicator getMixinApplicator() {
if (mixinApplicator == null)
mixinApplicator = new MixinApplicator();

Expand Down

0 comments on commit d04433f

Please sign in to comment.