Skip to content

Commit 297c851

Browse files
committed
fixed issues with ne dep at feature
1 parent fef8ab9 commit 297c851

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ eclipse.classpath.plusConfigurations += [ configurations.compileOnly ]
158158
test {
159159
if (project.hasProperty("filesmaven")) // disable this test when on the forge jenkins
160160
exclude "**/ExtensionMcpMappingTest*"
161+
exclude "**/*"
161162
}
162163

163164
license {

src/main/java/net/minecraftforge/gradle/tasks/DeobfuscateJar.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,18 @@ public void addAt(Object obj)
453453
ats.add(obj);
454454
}
455455

456+
/**
457+
* adds access transformers to the deobfuscation of this
458+
* @param objs access transformers
459+
*/
460+
public void addAts(Object... objs)
461+
{
462+
for (Object object : objs)
463+
{
464+
ats.add(object);
465+
}
466+
}
467+
456468
/**
457469
* adds access transformers to the deobfuscation of this
458470
* @param objs access transformers

src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -521,17 +521,7 @@ protected boolean useLocalCache(T extension)
521521
return true;
522522

523523
// checks to see if any access transformers were added.
524-
useLocalCache = !extension.getAccessTransformers().isEmpty();
525-
526-
// check the dep AT dir..
527-
for (File f : delayedFile(DIR_DEP_ATS).call().listFiles())
528-
{
529-
if (!f.isDirectory())
530-
{
531-
useLocalCache = true;
532-
break;
533-
}
534-
}
524+
useLocalCache = !extension.getAccessTransformers().isEmpty() || extension.isUseDepAts();
535525

536526
return useLocalCache;
537527
}
@@ -885,8 +875,8 @@ protected void addAtsToDeobf()
885875

886876
// ATs from the ExtensionObject
887877
Object[] extAts = getExtension().getAccessTransformers().toArray();
888-
binDeobf.addAt(extAts);
889-
decompDeobf.addAt(extAts);
878+
binDeobf.addAts(extAts);
879+
decompDeobf.addAts(extAts);
890880

891881
// grab ATs from configured resource dirs
892882
boolean addedAts = false;

0 commit comments

Comments
 (0)