zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

chore(core): deprecate prefixed accessors/mutators in CommandManager (#377)

Browse source 
chore(core): deprecate prefixed accessors/mutators in CommandManager.java

All prefixed (actual) getters/setters in CommandManager have been deprecated, and non-prefixed alternatives have been introduced. I've also put some effort into improving the JavaDocs of these methods.
This commit is contained in:
Alexander Söderberg 2022-06-13 10:57:12 +02:00 • committed by Jason
parent 687cd4c536
commit 296539d56c
48 changed files with 400 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java
View file

@ -152,10 +152,10 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
this.brigadierManager.backwardsBrigadierSenderMapper(this.backwardsCommandSourceMapper);
this.brigadierManager.brigadierSenderMapper(this.commandSourceMapper);
this.registerNativeBrigadierMappings(this.brigadierManager);
this.setCaptionRegistry(new FabricCaptionRegistry<>());
this.captionRegistry(new FabricCaptionRegistry<>());
this.registerCommandPreProcessor(new FabricCommandPreprocessor<>(this));
((FabricCommandRegistrationHandler<C, S>) this.getCommandRegistrationHandler()).initialize(this);
((FabricCommandRegistrationHandler<C, S>) this.commandRegistrationHandler()).initialize(this);
}
private void registerNativeBrigadierMappings(final @NonNull CloudBrigadierManager<C, S> brigadier) {
@ -165,7 +165,7 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
this.registerRegistryEntryMappings();
brigadier.registerMapping(new TypeToken<TeamArgument.TeamParser<C>>() {
}, builder -> builder.toConstant(net.minecraft.commands.arguments.TeamArgument.team()));
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(PlayerTeam.class),
params -> new TeamArgument.TeamParser<>()
);
@ -190,7 +190,7 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
/* Wrapped/Constant Brigadier types, mapped value type */
this.registerConstantNativeParserSupplier(MessageArgument.Message.class, MessageArgument.message());
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(MinecraftTime.class),
params -> FabricArgumentParsers.time()
);
@ -251,7 +251,7 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
seenClasses.add(GenericTypeReflector.erase(valueType));
/* and now, finally, we can register */
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(valueType),
params -> new RegistryEntryArgument.Parser(key)
);
@ -270,7 +270,7 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
final @NonNull Class<T> type,
final @NonNull Function<CommandBuildContext, @NonNull ArgumentType<T>> argument
) {
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(type),
params -> FabricArgumentParsers.contextual(argument)
);
@ -300,7 +300,7 @@ public abstract class FabricCommandManager<C, S extends SharedSuggestionProvider
final @NonNull TypeToken<T> type,
final @NonNull ArgumentType<T> argument
) {
this.getParserRegistry().registerParserSupplier(type, params -> new WrappedBrigadierParser<>(argument));
this.parserRegistry().registerParserSupplier(type, params -> new WrappedBrigadierParser<>(argument));
}
@Override

20
cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java
View file

@ -136,50 +136,50 @@ public final class FabricServerCommandManager<C> extends FabricCommandManager<C,
}
private void registerParsers() {
this.getParserRegistry().registerParserSupplier(TypeToken.get(Message.class), params -> FabricArgumentParsers.message());
this.parserRegistry().registerParserSupplier(TypeToken.get(Message.class), params -> FabricArgumentParsers.message());
// Location arguments
this.getParserRegistry().registerAnnotationMapper(
this.parserRegistry().registerAnnotationMapper(
Center.class,
(annotation, type) -> ParserParameters.single(FabricParserParameters.CENTER_INTEGERS, true)
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(Coordinates.class),
params -> FabricArgumentParsers.vec3(params.get(
FabricParserParameters.CENTER_INTEGERS,
false
))
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(Coordinates.CoordinatesXZ.class),
params -> FabricArgumentParsers.vec2(params.get(
FabricParserParameters.CENTER_INTEGERS,
false
))
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(Coordinates.BlockCoordinates.class),
params -> FabricArgumentParsers.blockPos()
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(Coordinates.ColumnCoordinates.class),
params -> FabricArgumentParsers.columnPos()
);
// Entity selectors
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(SinglePlayerSelector.class),
params -> FabricArgumentParsers.singlePlayerSelector()
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(MultiplePlayerSelector.class),
params -> FabricArgumentParsers.multiplePlayerSelector()
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(SingleEntitySelector.class),
params -> FabricArgumentParsers.singleEntitySelector()
);
this.getParserRegistry().registerParserSupplier(
this.parserRegistry().registerParserSupplier(
TypeToken.get(MultipleEntitySelector.class),
params -> FabricArgumentParsers.multipleEntitySelector()
);