From 4c3ed1b90ef000118cb1499a0f2ba024358e3811 Mon Sep 17 00:00:00 2001 From: tox1cozZ Date: Mon, 15 Aug 2022 12:39:54 +0300 Subject: [PATCH] Fix refmap generation for MixinExtras annotations --- build.gradle | 2 +- dependencies/mixin-0.8.2-processor-repack.jar | Bin 4828693 -> 4828693 bytes dependencies/mixin-0.8.2-repack.jar | Bin 3875610 -> 3875610 bytes gradle/configurations/v1.gradle | 4 ++-- .../MixinBooterLegacyPlugin.java | 2 +- .../MixinExtrasAnnotationProcessor.java | 4 ---- .../javax.annotation.processing.Processor | 4 ++-- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 69bd353..fc2f5df 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'forge' apply plugin: 'maven-publish' apply plugin: 'com.github.johnrengelman.shadow' -version = '1.1.0' +version = '1.1.1' group = 'io.github.tox1cozz.mixinbooterlegacy' sourceCompatibility = targetCompatibility = '1.8' diff --git a/dependencies/mixin-0.8.2-processor-repack.jar b/dependencies/mixin-0.8.2-processor-repack.jar index 1e0ec49946f90b360a156299a18c4d2929fdecca..6a3ac5aa400f38b074279d1224458e4d7ad364a9 100644 GIT binary patch delta 3999 zcmZWr2~?EV6&4tnVP;?k1X)JehDC!TgNQH)vbQZxnSkq`v6cbl4()-^hqKW4`=f3ZLcYXJN zkByghcy7eyS5)Ao(heG=(G1%C8^e0P-+C!OtD@=W{UrLikfQvw8a)0vSP|-O9!>Z- zxK~Bs!?1OE1lE?>2sl}mC^S9J3V#LRk=2@nx}pl7)^{qKCllf{cv$#}H<*E+3R3G^ zSA9NTnA|+7^Cl;K?d41n0GapKlTA{pw}sby?-9V?+w7qy$nPz$H0a#yv1vJN_ckP% zx$z4R6C958{FiaSs=3HB0M1!Gm&yZ}^(bO>OFUDiDOlaZumtEn3+R2wk=*+zPk}BNb zHR!2+^RD?Zq=|z=msAzcDIQ!{DI}%(lyp$Eu2&Py-2Iwr2(KBg)&Vx`o=EbTMV(Cy z?I^XK1WYl3->|6lymGu+!#hW*)lff5T^>N%*WH=sI(MV$35GFQYlOTU^+UD704A$H zA4yy+CjpWcsxQ)UfPSg^Y#33xHmJ`Ye@x*~Gc|s2tz0uYkhFNx!HX4184+&%QDcOP z?=*91iulD4-&E3_EHm?}w|xV7FQy7pLVbfyl1J>9P{5}D_+Ih)8TQF{zIQ3jy1sTZ z&qrG6A3?R)itZo$w7-}O>?CRYf1$zoB26&=x>P4h#gn!0<^}pd zo;dvx%0f_i^=V{c#zfS8M$9MADs9V%NSJ5bo+KHR1}u6^Lsvt{_~&xQ5^g z!4--t441++;Tno-7_JChk+`Cut2Da!6#3OD1-R$Mgu(9pn&MNM~OyKv*C<%EFex$KYY&!&vCeoa5=SYWclX+L zPo2D?xzUo!p%Awv$!`;x(6B^3Z+&`L6cZX2)CBXET&rFo)7OK@F#g~X!m-tp zDG3~!Rxk2+?NNN&7H*^i=Nri&X<&o2-yS+O`gB8);#A zw{=#LKZYtEg#SF1{|51{jIlYq$etX?vvZRv5pJ}hm)d99)94o7#vp3l!dWLBjLMS+zt*PzjO@kZ9M<1I&iUWp}4Nj6KRi%8;{`0K% zPB+K!sL5k2P?k9+Vgq?VVgYx@rmEqLd(56{!am)eUcjsVC~M%0yi^lmfTwY9CTa0} z3%D_UtO{&FW0&MT_OicZY{99=JMKuTwNVhP`Cq;l~PQweiJqyr*TYIkn9Bs#+Jv`ml_E!Bv__YJ)mp@LUYyrn1f(8rF^vignP>4hA`D5s>XHHw= zo%|6Lf+nEkZhq&80d8@$eUvy_n)A&`_Gs~!&F)$Z)|qNw9zww|ouRRh&G>uOb~;+< zthR%TK6SF+ci$f8(Z7A3ZiTE~dz*L$m1*IjeReAmsBg3T>}j;aUQZ`MDRN_|Ob-tB zuZzHc-@-=D^pM}As}JWKM5!K+ytvx+u~lpU2YVDB%ftTf|db`>edpo5*QJ@^~#dHT({p)=ii9(Te~D zbLGzj85M79h`ep3TLooSUfZ2YEzRuRXi@V4QP?$L>WY$ zx?e6FESw&f_vlEP@|CM@TzX&b6Q$CaFM1$r#nD{dg-6@;lUzyl0(Lx- zLejVv8XU(gZGa3<7{fK+M=d& z+H%EEZsmgbY&C5&)bFf@S?jtQsFR)6$J!BcZPPs|mTye-rx88zWcrI zy|eE8Hs5tPf{Kg$H2OY$bhwq?4NAZ{xM!`-Jd!H~JU}3VPEo6FN5fY*<3e-Ro1W z-28=)1rEjf{>$8})m-cw0;lc1i_~7segv`lg}&)i1XlkbDjB*?`reD|Wq5b95JaJO46&T8XI>XV_Iko(u_|aDPpBVXr@lp9HO|vFiX>)(#e;^7_7YOye8V@ z*XN0R^UgU5BuRpU=QWj23kx2M6jCz+N-xlEoiC?Yx%U-KKVCaXYXD5x9qHszn>LRa z`e9lpP0+<;e$A#e@~Y8V9q$;X)k4ECZAA!4U-jl#>%EPd#~9``y&1;jYaeI@1DLA) zY$$OtoMcFyr#(mI0OKON`-ECC`qx>;S0n}vVr6Z-d9E>( zr%e4Ba*wh93^kW1Mp!Y`a6pEFZs&3HT!X*I^Q-}f5j@WZjccMXEBY0XQUovFqy+9w z3|_4#e9q?ydEEU%aDb;|OVANVKQ3%#0%hM<|ZIIKps*(-o!O59Mr4~wTl%sl83 z%=z4^sV1(B>2{*OXJ2+A?8{EtLM%@BwRe*IVdFbV8Vzyrj943XB*l8JG$z57#(_86 zdrjEelKo-eoaALE2*dj%k2hyHHE`82XwY)P%2O~!T@L2}&-1N=;Q7|UxjBT3GXyT1y6%#~{R!khCc^XalKGv&21Pf3jJG3N;H#!uhTOyHSwo^dK^T-~SmAsh&tq zVAHhtk;Q8V97Vi&p*;|07ur`jNqTRUeTSK(58{VU=I+1Pb>O$b4*4W)yks7Mc??%Ve@qtNkCn*4-spI*7^5YI;#%9^4T= z+3K+M6Dz=Sj7=gg?bXrg(7?)0$AlQd#Ou<~m>s=0B70c?AseSL8_#E>%sj3~HNvHU z>=VHxpi_l{D7YV<-G2sQbX6c0P_7Fvcw3HsJYjgEvUu%| z93zZcoO5fE!0PY0t-Q7|Hn>FG{bXQ zL6-za%*ox=1p%P1E?6^+jAMv}{KNGwf6wKn0=V2XX79(Og?XAOTiWmvTTj&OFEO&s zr_E*C>4wu*viUTrtz_~g`>2xT67oYOD-aVHS;bEK5M-`ltps^%*a!4_@}&zHz0c6L zfIUYnurFl$}EG*20ENB3*7jLh04?f_OQd! ztngA&u4513^ULB{be~g^@TP0hXq9$2AL9t3HHlBrhCo1wc9fn>+ z!C~Dj{KZL1CapwTdFv!)v{Q-%5 z{3u@T9_O@p>MkfycVX-yd4|kBs8G4OaFmXY8@5AC5Y15aOS;54ZE>)zaKsQgezY{- zDje)1mec{Iw+lN4_XeJN*+MsquGfoJ_2s zqs9py!byMcU1t*Q#c}xzF>ILe+0c0NcaW>w!dRj8zxV4_b!oQj=sDM4r4) z9oLsU*m6wWX`tDpuhbQ>G{Y>p<jTp6hCqHmR4c7PvU2fa9HO;hUYVY~o_um(fJDEtIM*uY7b!X>5t> zeVHw>4P~~>rw2=EV7rVxXk`WSo`6t&`!#WdNv%T@he9c6;b?JV1{>=7~pljBa;=0K8$T z!Q0kU8_ScNimm&yEAArsZ(em71!%i@HLrXAjenadxD{k@cf;+|)5zjebjt{M4$koM zEQij+&tW0>gQBa8B1hmu6FFQw%d0cCExw`higKoM-}Ho7k>KJT<;)FN;&hG4k0eyG zWN4qGdp||k1Pk6##fbW>U29#lLN`+@$odh z1&TcS*X(4&G%U55nc-eQKb%B1(H0+jo+W|1Oy3$!w%@GQ&mnNJQSSq5wZ2m!b$OW$ z+c|1b9EOO;#*G}kyknka8uxG1+e9oBY}B{J5yB!n4TQ>e>Q7||)E1-jzP&)P@j&N; z@WM`g1+58uSpRp62;yBoR(!l^2X@|lRo_ip0-JB>_q)i8v-NRx8%}dP$)>=PNJIJp zS_OA?mJB|$+^}ADK2l}%@vIjO3b56NwpCOBr$OD=;lJ-2UZ)I>41N5w=Zz}#{MK+u zR>28XEqs^(>OI52K2rPEn>60lVl?xF7NhKXMvJlkHFDN`JIBjYf5lQE$7=diolNM+ zHkn~TqN#DIumKjSt0068dE~jI!ZjZM>7__*7nMqKoBdq97ioqs z??f(2BQM(cN%F#ZvpkutpQL+v@m1!6;tS@6XUU1x{o&CR3yh{j4g8r*@)Y6z{k%rA z!p(1^?l{SQJzgmyfRps`;tVD3$(`revGnjRMK=ZdoysbCGVuWT08`p?sREMo@ztsp z4eDBD&?Iayx?UNijsdrN=;O(_z5|MhZ!NJ}pl7Mo8%x2sg}Rq0gf{8vA*%|mA?yAs zLnodUBB%xx3(xY~Y;Y^nR_P%Jp4of?nD6DI&2~HQDYMxolE~zItSeCt$&)AXNl&t09XLncMM@1nyLX8jHn6*4{XjsVLJ>;!&I^ z2`IwnMoC0TLP2kp2dh~X~HJ^#VKfU-D z@%B+QSH!5{oXY`}ER<}N9LTvmXI8r5BsPc)J~au%5zXc54|A=LRYcDt75U0WgHvua zMmocnjJYUzaLLHrY4#^#v$OMZc_4==5c08Pl@_Vi*gFLNqp?#2em$3U5Ll7V-Xm}) zpY;$p9b|72C<(E>^fC>H*bV{}1&n?r`A-ViJhBWFFuM1^K99Yq6DHVG$bKh(3kK_% zo7XO5M=4Zj;QcO3rZ7JC160?RurYei`N#&0tzXFsDE9ZInj0>xWPTYtUV*W(2zh*Qn9s)?F)Z(-b;)hte?QI*zeww&kyE^$^mD6V@G3+jn6QYn;<>^e4|2#jn+ zI<0kVjI@t(H8($0&oW8FMav2NV*|1*+`myh^++Zd z;fA{>*m?T6;G_U`;-Bk=N9501dS&U`lveZ@K?AFA1Uot>Z$22NXBInJg^0$Yt*DRm+S!><^%AZfI6 zj!FAQ_D}n@*sQh4ZwEo-_?SbJ&fBU+djPj$v^DaJfS7Jc)jp6j5L1Tlc(uRC8PF~- z&d}~gimL%|*NZ=RM#8d2Mpht$L!CAjd9^RzGRCLYVb=I^|R0=#l)~j7fEERB)!O zPNRQM369R3^!_q8INMGtovyJ3L64kW+_K;=;)Mf{MdDKrGx*nU1Q(J$uqOy%x|Jx^ z7#*6fn^2z<0N%8Re&!(LNe+D>op)10wG_1`HS{Wh;ndJJ0xLbCO$2&94=h<}p*pf0 IP75{u53sp2YybcN delta 3123 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 L_2fC27Haw*?9O=p diff --git a/gradle/configurations/v1.gradle b/gradle/configurations/v1.gradle index 4efd31c..55f5df6 100644 --- a/gradle/configurations/v1.gradle +++ b/gradle/configurations/v1.gradle @@ -56,8 +56,8 @@ repositories { } dependencies { - implementation 'com.github.tox1cozZ:mixin-booter-legacy:1.1.0' - annotationProcessor 'com.github.tox1cozZ:mixin-booter-legacy:1.1.0:processor' + implementation 'com.github.tox1cozZ:mixin-booter-legacy:1.1.1' + annotationProcessor 'com.github.tox1cozZ:mixin-booter-legacy:1.1.1:processor' } tasks.register('mixin', MixinTask) diff --git a/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java b/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java index 0fcb597..ab7ddbd 100644 --- a/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java +++ b/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java @@ -88,7 +88,7 @@ public Container() { ModMetadata meta = getMetadata(); meta.modId = "mixinbooterlegacy"; meta.name = "MixinBooterLegacy"; - meta.version = "1.1.0"; + meta.version = "1.1.1"; meta.description = "A Mixin library and loader."; meta.logoFile = "/icon.png"; meta.authorList.addAll(Lists.newArrayList("Rongmario", "tox1cozZ")); diff --git a/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java b/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java index 2a2caea..ca1614b 100644 --- a/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java +++ b/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java @@ -10,10 +10,6 @@ import javax.lang.model.element.TypeElement; import java.util.Set; -/* - TODO: Refmap not working for new annotations - Use srg names or create dummy @Inject - */ @SupportedAnnotationTypes({}) public class MixinExtrasAnnotationProcessor extends AbstractProcessor { diff --git a/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 1cf5734..7ea5224 100644 --- a/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,3 +1,3 @@ +io.github.tox1cozz.mixinextras.MixinExtrasAnnotationProcessor org.spongepowered.tools.obfuscation.MixinObfuscationProcessorInjection -org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets -io.github.tox1cozz.mixinextras.MixinExtrasAnnotationProcessor \ No newline at end of file +org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets \ No newline at end of file