Skip to content

Commit

Permalink
Update for Mixin changes, Use gradle 4.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
LunNova committed Jul 30, 2017
1 parent d1eb0a4 commit 155f96a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,3 @@ tasks.withType(Jar) {
"Implementation-Vendor": url,
)
}

task wrapper(type: Wrapper) {
gradleVersion = '3.5'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri May 05 22:54:04 BST 2017
#Sun Jul 30 19:12:36 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import me.nallar.javapatcher.patcher.Patches;
import net.minecraft.launchwrapper.IClassTransformer;
import net.minecraft.launchwrapper.LaunchClassLoader;
import org.minimallycorrect.mixin.internal.ApplicationType;
import org.minimallycorrect.mixin.internal.MixinApplicator;
import org.minimallycorrect.modpatcher.api.tweaker.ModPatcherTweaker;

Expand Down Expand Up @@ -105,7 +106,7 @@ static MixinApplicator getMixinApplicator() {

if (mixinApplicator == null) {
ModPatcherTransformer.mixinApplicator = mixinApplicator = new MixinApplicator();
mixinApplicator.setMakeAccessible(false);
mixinApplicator.setApplicationType(ApplicationType.FINAL_PATCH);
mixinApplicator.setNoMixinIsError(true);
mixinApplicator.setLog(PatcherLog::info);
}
Expand Down

0 comments on commit 155f96a

Please sign in to comment.