@@ -81,104 +81,104 @@ public final class ProfilesCore {
8181 .imports (GameProfile .class , MinecraftSessionService .class , LoadingCache .class );
8282
8383 MinecraftClassHandle GameProfileCache = ns .ofMinecraft (
84- "package nms.server.players; public class GameProfileCache {} "
84+ "package nms.server.players; public class GameProfileCache"
8585 ).map (MinecraftMapping .SPIGOT , "UserCache" );
8686
8787 try {
8888 MinecraftClassHandle CraftMetaSkull = ns .ofMinecraft (
89- "package cb.inventory; class CraftMetaSkull extends CraftMetaItem implements SkullMeta {} "
89+ "package cb.inventory; class CraftMetaSkull extends CraftMetaItem implements SkullMeta"
9090 );
9191
9292 // This class has existed since ~v1.20.5, however Bukkit has started using it in their
9393 // classes since Paper v1.20.1b78, its function is basically similar to our Profileable class.
9494 MinecraftClassHandle ResolvableProfile =
95- ns .ofMinecraft ("package nms.world.item.component; public class ResolvableProfile {} " );
95+ ns .ofMinecraft ("package nms.world.item.component; public class ResolvableProfile" );
9696
9797 if (ResolvableProfile .exists ()) {
98- newResolvableProfile = ResolvableProfile .constructor ("public ResolvableProfile(GameProfile gameProfile); " ).reflect ();
99- $ResolvableProfile_gameProfile = ResolvableProfile .method ("public GameProfile gameProfile(); " )
98+ newResolvableProfile = ResolvableProfile .constructor ("public ResolvableProfile(GameProfile gameProfile)" ).reflect ();
99+ $ResolvableProfile_gameProfile = ResolvableProfile .method ("public GameProfile gameProfile()" )
100100 .map (MinecraftMapping .OBFUSCATED , "f" )
101101 .reflect ();
102102
103- bukkitUsesResolvableProfile = CraftMetaSkull .field ("private ResolvableProfile profile; " ).exists ();
103+ bukkitUsesResolvableProfile = CraftMetaSkull .field ("private ResolvableProfile profile" ).exists ();
104104 }
105105
106106 // @formatter:off
107107 profileGetterMeta = XReflection .any (
108- CraftMetaSkull .field ("private ResolvableProfile profile; " ),
109- CraftMetaSkull .field ("private GameProfile profile; " )
108+ CraftMetaSkull .field ("private ResolvableProfile profile" ),
109+ CraftMetaSkull .field ("private GameProfile profile" )
110110 ).modify (FieldMemberHandle ::getter ).reflect ();
111111 // @formatter:on
112112
113113 // @formatter:off
114114 // https://github.com/CryptoMorin/XSeries/issues/169
115115 // noinspection MethodMayBeStatic
116116 profileSetterMeta = XReflection .any (
117- CraftMetaSkull .method ("private void setProfile(ResolvableProfile profile); " ),
118- CraftMetaSkull .method ("private void setProfile(GameProfile profile); " ),
119- CraftMetaSkull .field ("private GameProfile profile ; " ).setter ()
117+ CraftMetaSkull .method ("private void setProfile(ResolvableProfile profile)" ),
118+ CraftMetaSkull .method ("private void setProfile(GameProfile profile)" ),
119+ CraftMetaSkull .field ("private GameProfile profile " ).setter ()
120120 ).reflect ();
121121 // @formatter:on
122122
123123 MinecraftClassHandle MinecraftServer = ns .ofMinecraft (
124- "package nms.server; public abstract class MinecraftServer {} "
124+ "package nms.server; public abstract class MinecraftServer"
125125 );
126126
127127 // Added by Bukkit
128- Object minecraftServer = MinecraftServer .method ("public static MinecraftServer getServer(); " ).reflect ().invoke ();
128+ Object minecraftServer = MinecraftServer .method ("public static MinecraftServer getServer()" ).reflect ().invoke ();
129129
130- minecraftSessionService = MinecraftServer .method ("public MinecraftSessionService getSessionService(); " )
130+ minecraftSessionService = MinecraftServer .method ("public MinecraftSessionService getSessionService()" )
131131 .named (/* 1.21.3 */ "aq" , /* 1.19.4 */ "ay" , /* 1.17.1 */ "getMinecraftSessionService" , "az" , "ao" , "am" , /* 1.20.4 */ "aD" , /* 1.20.6 */ "ar" , /* 1.13 */ "ap" )
132132 .reflect ().invoke (minecraftServer );
133133
134134 {
135135 FieldMemberHandle insecureProfilesFieldHandle = ns .ofMinecraft ("package com.mojang.authlib.yggdrasil;" +
136- "public class YggdrasilMinecraftSessionService implements MinecraftSessionService {} " ).field ().getter ();
136+ "public class YggdrasilMinecraftSessionService implements MinecraftSessionService" ).field ().getter ();
137137 if (NULLABILITY_RECORD_UPDATE ) {
138- insecureProfilesFieldHandle .signature ("private final LoadingCache<UUID, Optional<ProfileResult>> insecureProfiles; " );
138+ insecureProfilesFieldHandle .signature ("private final LoadingCache<UUID, Optional<ProfileResult>> insecureProfiles" );
139139 } else {
140- insecureProfilesFieldHandle .signature ("private final LoadingCache<GameProfile, GameProfile> insecureProfiles; " );
140+ insecureProfilesFieldHandle .signature ("private final LoadingCache<GameProfile, GameProfile> insecureProfiles" );
141141 }
142142 MethodHandle insecureProfilesField = insecureProfilesFieldHandle .reflectOrNull ();
143143 if (insecureProfilesField != null ) {
144144 insecureProfiles = insecureProfilesField .invoke (minecraftSessionService );
145145 }
146146 }
147147
148- userCache = MinecraftServer .method ("public GameProfileCache getProfileCache(); " )
148+ userCache = MinecraftServer .method ("public GameProfileCache getProfileCache()" )
149149 .named ("at" , /* 1.21.3 */ "ar" , /* 1.18.2 */ "ao" , /* 1.20.4 */ "ap" , /* 1.20.6 */ "au" )
150150 .map (MinecraftMapping .OBFUSCATED , /* 1.9.4 */ "getUserCache" )
151151 .reflect ().invoke (minecraftServer );
152152
153153 if (!NULLABILITY_RECORD_UPDATE ) {
154154 fillProfileProperties = ns .of (MinecraftSessionService .class ).method (
155- "public GameProfile fillProfileProperties(GameProfile profile, boolean flag); "
155+ "public GameProfile fillProfileProperties(GameProfile profile, boolean flag)"
156156 ).reflect ();
157157 }
158158
159159 // noinspection MethodMayBeStatic
160- UserCache_getNextOperation = GameProfileCache .method ("private long getNextOperation(); " )
160+ UserCache_getNextOperation = GameProfileCache .method ("private long getNextOperation()" )
161161 .map (MinecraftMapping .OBFUSCATED , v (21 , "e" ).v (16 , "d" ).orElse ("d" )).reflectOrNull ();
162162
163163 MethodMemberHandle profileByName = GameProfileCache .method ().named (/* v1.17.1 */ "getProfile" , "a" );
164164 MethodMemberHandle profileByUUID = GameProfileCache .method ().named (/* v1.17.1 */ "getProfile" , "a" );
165165 // @formatter:off
166166 getProfileByName = XReflection .anyOf (
167- () -> profileByName .signature ("public GameProfile get(String username); " ),
168- () -> profileByName .signature ("public Optional<GameProfile> get(String username); " )
167+ () -> profileByName .signature ("public GameProfile get(String username)" ),
168+ () -> profileByName .signature ("public Optional<GameProfile> get(String username)" )
169169 ).reflect ();
170170 getProfileByUUID = XReflection .anyOf (
171- () -> profileByUUID .signature ("public GameProfile get(UUID id); " ),
172- () -> profileByUUID .signature ("public Optional<GameProfile> get(UUID id); " )
171+ () -> profileByUUID .signature ("public GameProfile get(UUID id)" ),
172+ () -> profileByUUID .signature ("public Optional<GameProfile> get(UUID id)" )
173173 ).reflect ();
174174 // @formatter:on
175175
176- cacheProfile = GameProfileCache .method ("public void add(GameProfile profile); " )
176+ cacheProfile = GameProfileCache .method ("public void add(GameProfile profile)" )
177177 .map (MinecraftMapping .OBFUSCATED , "a" ).reflect ();
178178
179179 try {
180180 // Some versions don't have the public getProxy() method. It's very very inconsistent...
181- proxy = (Proxy ) MinecraftServer .field ("protected final java.net.Proxy proxy; " ).getter ()
181+ proxy = (Proxy ) MinecraftServer .field ("protected final java.net.Proxy proxy" ).getter ()
182182 .map (MinecraftMapping .OBFUSCATED , v (20 , 5 , "h" ).v (20 , 3 , "i" )
183183 .v (19 , "j" )
184184 .v (18 , 2 , "n" ).v (18 , "o" )
@@ -195,16 +195,16 @@ public final class ProfilesCore {
195195 }
196196
197197 MinecraftClassHandle CraftSkull = ns .ofMinecraft (
198- "package cb.block; public class CraftSkull extends CraftBlockEntityState implements Skull {} "
198+ "package cb.block; public class CraftSkull extends CraftBlockEntityState implements Skull"
199199 );
200200
201201 FieldMemberHandle CraftSkull_profile = XReflection .any (
202- CraftSkull .field ("private ResolvableProfile profile; " ),
203- CraftSkull .field ("private GameProfile profile; " )
202+ CraftSkull .field ("private ResolvableProfile profile" ),
203+ CraftSkull .field ("private GameProfile profile" )
204204 ).getHandle ();
205205
206206 Property_getValue = NULLABILITY_RECORD_UPDATE ? null :
207- ns .of (Property .class ).method ("public String getValue(); " ).unreflect ();
207+ ns .of (Property .class ).method ("public String getValue()" ).unreflect ();
208208
209209 PROXY = proxy ;
210210 USER_CACHE = userCache ;
@@ -228,27 +228,27 @@ public final class ProfilesCore {
228228 ResolvableProfile$bukkitSupports = bukkitUsesResolvableProfile ;
229229
230230 MinecraftClassHandle UserCacheEntry = GameProfileCache
231- .inner ("private static class GameProfileInfo {} " )
231+ .inner ("private static class GameProfileInfo" )
232232 .map (MinecraftMapping .SPIGOT , "UserCacheEntry" );
233233
234- UserCacheEntry_getProfile = UserCacheEntry .method ("public GameProfile getProfile(); " )
234+ UserCacheEntry_getProfile = UserCacheEntry .method ("public GameProfile getProfile()" )
235235 .map (MinecraftMapping .OBFUSCATED , "a" ).makeAccessible ()
236236 .unreflect ();
237- UserCacheEntry_setLastAccess = UserCacheEntry .method ("public void setLastAccess(long i); " )
237+ UserCacheEntry_setLastAccess = UserCacheEntry .method ("public void setLastAccess(long i)" )
238238 .map (MinecraftMapping .OBFUSCATED , "a" ).reflectOrNull ();
239239
240240 try {
241241 // private final Map<String, UserCache.UserCacheEntry> profilesByName = Maps.newConcurrentMap();
242- UserCache_profilesByName = (Map <String , Object >) GameProfileCache .field ("private final Map<String, UserCache.UserCacheEntry> profilesByName; " )
242+ UserCache_profilesByName = (Map <String , Object >) GameProfileCache .field ("private final Map<String, UserCache.UserCacheEntry> profilesByName" )
243243 .getter ().map (MinecraftMapping .OBFUSCATED , v (17 , "e" ).v (16 , 2 , "c" ).v (9 , "d" ).orElse ("c" ))
244244 .reflect ().invoke (userCache );
245245 // private final Map<UUID, UserCache.UserCacheEntry> profilesByUUID = Maps.newConcurrentMap();
246- UserCache_profilesByUUID = (Map <UUID , Object >) GameProfileCache .field ("private final Map<UUID, UserCache.UserCacheEntry> profilesByUUID; " )
246+ UserCache_profilesByUUID = (Map <UUID , Object >) GameProfileCache .field ("private final Map<UUID, UserCache.UserCacheEntry> profilesByUUID" )
247247 .getter ().map (MinecraftMapping .OBFUSCATED , v (17 , "f" ).v (16 , 2 , "d" ).v (9 , "e" ).orElse ("d" ))
248248 .reflect ().invoke (userCache );
249249
250250 // private final Deque<GameProfile> f = new LinkedBlockingDeque(); Removed in v1.16
251- // MethodHandle deque = GameProfileCache.field("private final Deque<GameProfile> f; ")
251+ // MethodHandle deque = GameProfileCache.field("private final Deque<GameProfile> f")
252252 // .getter().reflectOrNull();
253253 } catch (Throwable e ) {
254254 throw new IllegalStateException ("Failed to initialize ProfilesCore" , e );
0 commit comments