@@ -141,13 +141,13 @@ private Builder(final @NonNull String name) {
141141 */
142142 public static final class Parser <C > implements ArgumentParser <C , BlockPredicate > {
143143
144- private static final Class <?> TAG_REGISTRY_CLASS ;
144+ private static final Class <?> TAG_CONTAINER_CLASS ;
145145
146146 static {
147147 if (CraftBukkitReflection .MAJOR_REVISION > 12 && CraftBukkitReflection .MAJOR_REVISION < 16 ) {
148- TAG_REGISTRY_CLASS = CraftBukkitReflection .needNMSClass ("TagRegistry" );
148+ TAG_CONTAINER_CLASS = CraftBukkitReflection .needNMSClass ("TagRegistry" );
149149 } else {
150- TAG_REGISTRY_CLASS = CraftBukkitReflection .firstNonNullOrThrow (
150+ TAG_CONTAINER_CLASS = CraftBukkitReflection .firstNonNullOrThrow (
151151 () -> "Couldn't find TagContainer class" ,
152152 CraftBukkitReflection .findNMSClass ("ITagRegistry" ),
153153 CraftBukkitReflection .findMCClass ("tags.ITagRegistry" ),
@@ -193,19 +193,15 @@ public static final class Parser<C> implements ArgumentParser<C, BlockPredicate>
193193 CraftBukkitReflection .findMCClass ("core.BlockPosition" ),
194194 CraftBukkitReflection .findMCClass ("core.BlockPos" )
195195 );
196- private static final @ Nullable Class <?> TAG_CONTAINER_CLASS = CraftBukkitReflection .firstNonNullOrNull (
197- CraftBukkitReflection .findClass ("net.minecraft.tags.TagContainer" ),
198- CraftBukkitReflection .findClass ("net.minecraft.tags.ITagRegistry" )
199- );
200196 private static final Constructor <?> BLOCK_POSITION_CTR =
201197 CraftBukkitReflection .needConstructor (BLOCK_POSITION_CLASS , int .class , int .class , int .class );
202198 private static final Constructor <?> SHAPE_DETECTOR_BLOCK_CTR = CraftBukkitReflection
203199 .needConstructor (SHAPE_DETECTOR_BLOCK_CLASS , LEVEL_READER_CLASS , BLOCK_POSITION_CLASS , boolean .class );
204200 private static final Method GET_HANDLE_METHOD = CraftBukkitReflection .needMethod (CRAFT_WORLD_CLASS , "getHandle" );
205201 private static final Method CREATE_PREDICATE_METHOD = CraftBukkitReflection .firstNonNullOrThrow (
206202 () -> "create on BlockPredicateArgument$Result" ,
207- CraftBukkitReflection .findMethod (ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS , "create" , TAG_REGISTRY_CLASS ),
208- CraftBukkitReflection .findMethod (ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS , "a" , TAG_REGISTRY_CLASS )
203+ CraftBukkitReflection .findMethod (ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS , "create" , TAG_CONTAINER_CLASS ),
204+ CraftBukkitReflection .findMethod (ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS , "a" , TAG_CONTAINER_CLASS )
209205 );
210206 private static final Method GET_SERVER_METHOD = CraftBukkitReflection .streamMethods (
211207 COMMAND_LISTENER_WRAPPER_CLASS ,
@@ -216,7 +212,7 @@ public static final class Parser<C> implements ArgumentParser<C, BlockPredicate>
216212 () -> "getTags method on MinecraftServer" ,
217213 CraftBukkitReflection .findMethod (MINECRAFT_SERVER_CLASS , "getTagRegistry" ),
218214 CraftBukkitReflection .findMethod (MINECRAFT_SERVER_CLASS , "getTags" ),
219- TAG_CONTAINER_CLASS == null ? null : CraftBukkitReflection .streamMethods (MINECRAFT_SERVER_CLASS , stream ->
215+ CraftBukkitReflection .streamMethods (MINECRAFT_SERVER_CLASS , stream ->
220216 stream .filter (it -> it .getReturnType ().equals (TAG_CONTAINER_CLASS ) && it .getParameterCount () == 0 )
221217 .findFirst ().orElse (null ))
222218 );
0 commit comments