conflicts

This commit is contained in:
Jesse Boyd
2019-08-07 01:25:53 +10:00
parent accc62c10b
commit b6bc09226c
4 changed files with 113 additions and 108 deletions

View File

@ -62,6 +62,7 @@ import com.sk89q.worldedit.command.NavigationCommands;
import com.sk89q.worldedit.command.NavigationCommandsRegistration;
import com.sk89q.worldedit.command.PaintBrushCommands;
import com.sk89q.worldedit.command.PatternCommands;
import com.sk89q.worldedit.command.PatternCommandsRegistration;
import com.sk89q.worldedit.command.RegionCommands;
import com.sk89q.worldedit.command.RegionCommandsRegistration;
import com.sk89q.worldedit.command.SchematicCommands;
@ -117,7 +118,6 @@ import com.sk89q.worldedit.internal.command.CommandRegistrationHandler;
import com.sk89q.worldedit.internal.command.exception.ExceptionConverter;
import com.sk89q.worldedit.internal.command.exception.WorldEditExceptionConverter;
import com.sk89q.worldedit.internal.util.Substring;
import com.sk89q.worldedit.scripting.CommandScriptLoader;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.util.auth.AuthorizationException;
import com.sk89q.worldedit.util.eventbus.Subscribe;
@ -256,14 +256,14 @@ public final class PlatformCommandManager {
public void registerAlwaysInjectedValues() {
globalInjectedValues.injectValue(Key.of(InjectedValueAccess.class), Optional::of);
register(new AnnotatedBindings(worldEdit));
register(new CommandBindings(worldEdit));
register(new ConsumeBindings(worldEdit));
register(new ProvideBindings(worldEdit));
register(new ProvideBindings(worldEdit));
registerBinding(new AnnotatedBindings(worldEdit));
registerBinding(new CommandBindings(worldEdit));
registerBinding(new ConsumeBindings(worldEdit));
registerBinding(new ProvideBindings(worldEdit));
registerBinding(new ProvideBindings(worldEdit));
}
public void register(Object classWithMethods) {
public void registerBinding(Object classWithMethods) {
// TODO NOT IMPLEMENTED - register the following using a custom processor / annotations
}
@ -299,6 +299,10 @@ public final class PlatformCommandManager {
});
}
public void getCommand(String arguments) {
}
public void registerAllCommands() {
if (Settings.IMP.ENABLED_COMPONENTS.COMMANDS) {
// TODO NOT IMPLEMENTED dunno why these have issues generating
@ -412,11 +416,6 @@ public final class PlatformCommandManager {
GenerationCommandsRegistration.builder(),
new GenerationCommands(worldEdit)
);
this.registration.register(
new CFICommand(commandManager),
CFICommandsRegistration.builder(),
new CFICommands(worldEdit)
);
this.registration.register(
commandManager,
HistoryCommandsRegistration.builder(),
@ -535,7 +534,7 @@ public final class PlatformCommandManager {
// Delay command registration to allow time for other plugins to hook into FAWE
try {
new CommandScriptLoader().load();
// new CommandScriptLoader().load();
} catch (Throwable e) {
e.printStackTrace();
}
@ -564,6 +563,7 @@ public final class PlatformCommandManager {
}
platform.registerCommands(commandManager);
// commandManager.getCommand("pattern").get()
}
void removeCommands() {