Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle lack of global injected value store

Browse Source
This commit is contained in:
Kenzie Togami 2019-04-18 19:59:53 -07:00
parent 48fcfeed35
commit f481f7d26d
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandMananger.java
View File

@ -73,6 +73,7 @@ import org.enginehub.piston.inject.InjectedValueStore;
import org.enginehub.piston.inject.Key; import org.enginehub.piston.inject.Key;
import org.enginehub.piston.inject.MapBackedValueStore; import org.enginehub.piston.inject.MapBackedValueStore;
import org.enginehub.piston.inject.MemoizingValueAccess; import org.enginehub.piston.inject.MemoizingValueAccess;
import org.enginehub.piston.inject.MergedValueAccess;
import org.enginehub.piston.part.SubCommandPart; import org.enginehub.piston.part.SubCommandPart;
import org.enginehub.piston.util.ValueProvider; import org.enginehub.piston.util.ValueProvider;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -107,6 +108,7 @@ public final class PlatformCommandMananger {
private final WorldEdit worldEdit; private final WorldEdit worldEdit;
private final PlatformManager platformManager; private final PlatformManager platformManager;
private final CommandManager commandManager; private final CommandManager commandManager;
private final InjectedValueStore globalInjectedValues;
private final DynamicStreamHandler dynamicHandler = new DynamicStreamHandler(); private final DynamicStreamHandler dynamicHandler = new DynamicStreamHandler();
private final WorldEditExceptionConverter exceptionConverter; private final WorldEditExceptionConverter exceptionConverter;
private final List<CommandCallListener> callListeners; private final List<CommandCallListener> callListeners;
@ -124,6 +126,7 @@ public final class PlatformCommandMananger {
this.exceptionConverter = new WorldEditExceptionConverter(worldEdit); this.exceptionConverter = new WorldEditExceptionConverter(worldEdit);
this.commandManager = DefaultCommandManagerService.getInstance() this.commandManager = DefaultCommandManagerService.getInstance()
.newCommandManager(); .newCommandManager();
this.globalInjectedValues = MapBackedValueStore.create();
this.callListeners = Collections.singletonList( this.callListeners = Collections.singletonList(
new CommandLoggingHandler(worldEdit, commandLog) new CommandLoggingHandler(worldEdit, commandLog)
); );
@ -169,7 +172,7 @@ public final class PlatformCommandMananger {
} }
private void registerAlwaysInjectedValues() { private void registerAlwaysInjectedValues() {
commandManager.injectValue(Key.of(Region.class, Selection.class), globalInjectedValues.injectValue(Key.of(Region.class, Selection.class),
context -> { context -> {
LocalSession localSession = context.injectedValue(Key.of(LocalSession.class)) LocalSession localSession = context.injectedValue(Key.of(LocalSession.class))
.orElseThrow(() -> new IllegalStateException("No LocalSession")); .orElseThrow(() -> new IllegalStateException("No LocalSession"));
@ -183,7 +186,7 @@ public final class PlatformCommandMananger {
} }
}); });
}); });
commandManager.injectValue(Key.of(EditSession.class), globalInjectedValues.injectValue(Key.of(EditSession.class),
context -> { context -> {
LocalSession localSession = context.injectedValue(Key.of(LocalSession.class)) LocalSession localSession = context.injectedValue(Key.of(LocalSession.class))
.orElseThrow(() -> new IllegalStateException("No LocalSession")); .orElseThrow(() -> new IllegalStateException("No LocalSession"));
@ -393,7 +396,9 @@ public final class PlatformCommandMananger {
return Optional.of(localSession); return Optional.of(localSession);
}); });
MemoizingValueAccess context = MemoizingValueAccess.wrap(store); MemoizingValueAccess context = MemoizingValueAccess.wrap(
MergedValueAccess.of(store, globalInjectedValues)
);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
@ -437,7 +442,7 @@ public final class PlatformCommandMananger {
} }
} finally { } finally {
Optional<EditSession> editSessionOpt = Optional<EditSession> editSessionOpt =
context.injectedValueIfMemoized(Key.of(EditSession.class)); context.snapshotMemory().injectedValue(Key.of(EditSession.class));
if (editSessionOpt.isPresent()) { if (editSessionOpt.isPresent()) {
EditSession editSession = editSessionOpt.get(); EditSession editSession = editSessionOpt.get();
@ -468,8 +473,8 @@ public final class PlatformCommandMananger {
@Subscribe @Subscribe
public void handleCommandSuggestion(CommandSuggestionEvent event) { public void handleCommandSuggestion(CommandSuggestionEvent event) {
try { try {
commandManager.injectValue(Key.of(Actor.class), ValueProvider.constant(event.getActor())); globalInjectedValues.injectValue(Key.of(Actor.class), ValueProvider.constant(event.getActor()));
commandManager.injectValue(Key.of(Arguments.class), ValueProvider.constant(event::getArguments)); globalInjectedValues.injectValue(Key.of(Arguments.class), ValueProvider.constant(event::getArguments));
// TODO suggestions // TODO suggestions
} catch (CommandException e) { } catch (CommandException e) {
event.getActor().printError(e.getMessage()); event.getActor().printError(e.getMessage());