1515import org .spongepowered .asm .mixin .Shadow ;
1616import org .spongepowered .asm .mixin .injection .At ;
1717
18- <<<<<<< HEAD
19- import com .llamalad7 .mixinextras .injector .ModifyExpressionValue ;
20- import com .llamalad7 .mixinextras .sugar .Local ;
21-
22- import net .cevapi .security .ResourcePackProtector ;
23- import net .minecraft .util .Downloader ;
24-
25- @ Mixin (Downloader .class )
26- public abstract class DownloaderMixin
27- =======
2818import com .llamalad7 .mixinextras .injector .wrapoperation .Operation ;
2919import com .llamalad7 .mixinextras .injector .wrapoperation .WrapOperation ;
3020
@@ -35,22 +25,11 @@ public abstract class DownloaderMixin
3525
3626@ Mixin (Downloader .class )
3727public abstract class DownloaderMixin implements AutoCloseable
38- >>>>>>> upstream /master
3928{
4029 @ Shadow
4130 @ Final
4231 private Path directory ;
4332
44- <<<<<<< HEAD
45- @ ModifyExpressionValue (method = "method_55485" ,
46- at = @ At (value = "INVOKE" ,
47- target = "Ljava/nio/file/Path;resolve(Ljava/lang/String;)Ljava/nio/file/Path;" ))
48- private Path cevapi$rewriteDownloadPath (Path original ,
49- @ Local (argsOnly = true ) UUID packId )
50- {
51- return ResourcePackProtector .remapDownloadPath (directory , original ,
52- packId );
53- =======
5433 /**
5534 * Patches a fingerprinting vulnerability by creating a separate cache
5635 * folder for each Minecraft account.
@@ -85,6 +64,5 @@ private Path wrapResolve(Path instance, String filename,
8564
8665 return result .getParent ().resolve (uuid .toString ())
8766 .resolve (result .getFileName ());
88- >>>>>>> upstream /master
8967 }
9068}
0 commit comments